recoll / Code / Diff of /src/qtgui/main.cpp

Diff of /src/qtgui/main.cpp [0667b2] .. [5c67dd]

Switch to unified view


#ifndef lint
static char rcsid[] = "@(#$Id: main.cpp,v 1.19 2005-11-25 10:26:35 dockes Exp $ (C) 2005 J.F.Dockes";
#endif

#include <unistd.h>

#include <qapplication.h>
...
#include "wipedir.h"
#include "rclinit.h"
#include "history.h"

#include "recollmain.h"

static const char *recollsharedir = "/usr/local/share/recoll";

RclConfig *rclconfig;
Rcl::Db *rcldb;
int recollNeedsExit;
string tmpdir;
...
    // translation file for Qt
    QTranslator qt( 0 );
    qt.load( QString( "qt_" ) + QTextCodec::locale(), "." );
    a.installTranslator( &qt );







    // Restore some settings from previous session
    QSettings settings;
    settings.setPath("Recoll.org", "Recoll");
    int width = settings.readNumEntry( "/Recoll/geometry/width", 590);
    int height = settings.readNumEntry( "/Recoll/geometry/height", 810);
...
    
    // Create main window and set its size to previous session's
    RecollMain w;
    mainWindow = &w;
    w.resize(s);

    
    string reason;
    rclconfig = recollinit(recollCleanup, sigcleanup, reason);
    if (!rclconfig || !rclconfig->ok()) {
    QString msg = a.translate("Main", "Configuration problem: ");
...
                  a.translate("Main", 
                      "No db directory in configuration"));
    exit(1);
    }

    // Translations for Recoll
    string translatdir = string(recollsharedir);
    path_cat(translatdir, "translations");
    QTranslator translator( 0 );
    // QTextCodec::locale() returns $LANG
    translator.load( QString("recoll_") + QTextCodec::locale(), 
           translatdir.c_str() );
    a.installTranslator( &translator );

    showicons = false;
    rclconfig->getConfParam("showicons", &showicons);
    rclconfig->getConfParam("iconsdir", iconsdir);
    if (iconsdir.empty()) {
  iconsdir = string(recollsharedir);
  path_cat(iconsdir, "images");
    } else {
    iconsdir = path_tildexpand(iconsdir);
    }

    if (!maketmpdir(tmpdir)) {
    QMessageBox::critical(0, "Recoll",
                  a.translate("Main", 
                     "Cannot create temporary directory"));

	a/src/qtgui/main.cpp		b/src/qtgui/main.cpp
1	#ifndef lint	1	#ifndef lint
2	static char rcsid[] = "@(#$Id: main.cpp,v 1.18 2005-11-25 10:02:36 dockes Exp $ (C) 2005 J.F.Dockes";	2	static char rcsid[] = "@(#$Id: main.cpp,v 1.19 2005-11-25 10:26:35 dockes Exp $ (C) 2005 J.F.Dockes";
3	#endif	3	#endif
4		4
5	#include <unistd.h>	5	#include <unistd.h>
6		6
7	#include <qapplication.h>	7	#include <qapplication.h>
	...		...
25	#include "wipedir.h"	25	#include "wipedir.h"
26	#include "rclinit.h"	26	#include "rclinit.h"
27	#include "history.h"	27	#include "history.h"
28		28
29	#include "recollmain.h"	29	#include "recollmain.h"
		30
		31	static const char *recollsharedir = "/usr/local/share/recoll";
30		32
31	RclConfig *rclconfig;	33	RclConfig *rclconfig;
32	Rcl::Db *rcldb;	34	Rcl::Db *rcldb;
33	int recollNeedsExit;	35	int recollNeedsExit;
34	string tmpdir;	36	string tmpdir;
	...		...
109	// translation file for Qt	111	// translation file for Qt
110	QTranslator qt( 0 );	112	QTranslator qt( 0 );
111	qt.load( QString( "qt_" ) + QTextCodec::locale(), "." );	113	qt.load( QString( "qt_" ) + QTextCodec::locale(), "." );
112	a.installTranslator( &qt );	114	a.installTranslator( &qt );
113		115
114	// Translations for Recoll
115	QTranslator translator( 0 );
116	// QTextCodec::locale() returns $LANG
117	translator.load( QString("recoll_") + QTextCodec::locale(), "." );
118	a.installTranslator( &translator );
119
120	// Restore some settings from previous session	116	// Restore some settings from previous session
121	QSettings settings;	117	QSettings settings;
122	settings.setPath("Recoll.org", "Recoll");	118	settings.setPath("Recoll.org", "Recoll");
123	int width = settings.readNumEntry( "/Recoll/geometry/width", 590);	119	int width = settings.readNumEntry( "/Recoll/geometry/width", 590);
124	int height = settings.readNumEntry( "/Recoll/geometry/height", 810);	120	int height = settings.readNumEntry( "/Recoll/geometry/height", 810);
	...		...
126		122
127	// Create main window and set its size to previous session's	123	// Create main window and set its size to previous session's
128	RecollMain w;	124	RecollMain w;
129	mainWindow = &w;	125	mainWindow = &w;
130	w.resize(s);	126	w.resize(s);
131
132		127
133	string reason;	128	string reason;
134	rclconfig = recollinit(recollCleanup, sigcleanup, reason);	129	rclconfig = recollinit(recollCleanup, sigcleanup, reason);
135	if (!rclconfig \|\| !rclconfig->ok()) {	130	if (!rclconfig \|\| !rclconfig->ok()) {
136	QString msg = a.translate("Main", "Configuration problem: ");	131	QString msg = a.translate("Main", "Configuration problem: ");
	...		...
147	a.translate("Main",	142	a.translate("Main",
148	"No db directory in configuration"));	143	"No db directory in configuration"));
149	exit(1);	144	exit(1);
150	}	145	}
151		146
		147	// Translations for Recoll
		148	string translatdir = string(recollsharedir);
		149	path_cat(translatdir, "translations");
		150	QTranslator translator( 0 );
		151	// QTextCodec::locale() returns $LANG
		152	translator.load( QString("recoll_") + QTextCodec::locale(),
		153	translatdir.c_str() );
		154	a.installTranslator( &translator );
		155
152	showicons = false;	156	showicons = false;
153	rclconfig->getConfParam("showicons", &showicons);	157	rclconfig->getConfParam("showicons", &showicons);
154	rclconfig->getConfParam("iconsdir", iconsdir);	158	rclconfig->getConfParam("iconsdir", iconsdir);
155	if (iconsdir.empty())	159	if (iconsdir.empty()) {
156	iconsdir = "/usr/local/share/recoll/images";	160	iconsdir = string(recollsharedir);
		161	path_cat(iconsdir, "images");
157	else	162	} else {
158	iconsdir = path_tildexpand(iconsdir);	163	iconsdir = path_tildexpand(iconsdir);
		164	}
159		165
160	if (!maketmpdir(tmpdir)) {	166	if (!maketmpdir(tmpdir)) {
161	QMessageBox::critical(0, "Recoll",	167	QMessageBox::critical(0, "Recoll",
162	a.translate("Main",	168	a.translate("Main",
163	"Cannot create temporary directory"));	169	"Cannot create temporary directory"));