Attachment #296 for bug #692

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 692
Collapse All | Expand All

Lines 66-71 Link Here

(-)tdebase/kate/app/kateconfigdialog.h (+1 lines)
66		66
67	TQCheckBox *cb_fullPath;	67	TQCheckBox *cb_fullPath;
68	TQCheckBox *cb_syncKonsole;	68	TQCheckBox *cb_syncKonsole;
		69	TQCheckBox *cb_useInstance;
69	TQCheckBox *cb_sortFiles;	70	TQCheckBox *cb_sortFiles;
70	TQSpinBox *sb_numRecentFiles;	71	TQSpinBox *sb_numRecentFiles;
71	TQCheckBox *cb_modNotifications;	72	TQCheckBox *cb_modNotifications;

Lines 182-187 Link Here

(-)tdebase/kate/app/katemainwindow.h (+1 lines)
182	Kate::ToolViewManager *m_toolViewManager;	182	Kate::ToolViewManager *m_toolViewManager;
183		183
184	bool syncKonsole;	184	bool syncKonsole;
		185	bool useInstance;
185	bool modNotification;	186	bool modNotification;
186		187
187	DCOPObject *m_dcop;	188	DCOPObject *m_dcop;

Lines 41-46 Link Here

(-)tdebase/kate/app/katemain.cpp (-2 / +13 lines)
41	{ "start <name>", I18N_NOOP("Start Kate with a given session"), 0 },	41	{ "start <name>", I18N_NOOP("Start Kate with a given session"), 0 },
42	{ "u", 0, 0 },	42	{ "u", 0, 0 },
43	{ "use", I18N_NOOP("Use a already running kate instance (if possible)"), 0 },	43	{ "use", I18N_NOOP("Use a already running kate instance (if possible)"), 0 },
		44	{ "f", 0, 0 },
		45	{ "force-sdi", I18N_NOOP("Force single document mode if the MDI setting is enabled."), 0 },
44	{ "p", 0, 0 },	46	{ "p", 0, 0 },
45	{ "pid <pid>", I18N_NOOP("Only try to reuse kate instance with this pid"), 0 },	47	{ "pid <pid>", I18N_NOOP("Only try to reuse kate instance with this pid"), 0 },
46	{ "e", 0, 0 },	48	{ "e", 0, 0 },
Lines 57-65 Link Here
57		59
58	extern "C" KDE_EXPORT int kdemain( int argc, char **argv )	60	extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
59	{	61	{
		62	KConfig * config = NULL;
		63	bool alwaysUseInstance;
60	// here we go, construct the Kate version	64	// here we go, construct the Kate version
61	TQString kateVersion = KateApp::kateVersion();	65	TQString kateVersion = KateApp::kateVersion();
62		66
		67	KInstance instance( "kate" );
		68
63	KAboutData aboutData ("kate", I18N_NOOP("Kate"), kateVersion.latin1(),	69	KAboutData aboutData ("kate", I18N_NOOP("Kate"), kateVersion.latin1(),
64	I18N_NOOP( "Kate - Advanced Text Editor" ), KAboutData::License_LGPL_V2,	70	I18N_NOOP( "Kate - Advanced Text Editor" ), KAboutData::License_LGPL_V2,
65	I18N_NOOP( "(c) 2000-2005 The Kate Authors" ), 0, "http://kate.kde.org");	71	I18N_NOOP( "(c) 2000-2005 The Kate Authors" ), 0, "http://kate.kde.org");
Lines 107-114 Link Here
107	// get our command line args ;)	113	// get our command line args ;)
108	KCmdLineArgs* args = KCmdLineArgs::parsedArgs();	114	KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
109		115
110	// now, first try to contact running kate instance if needed	116	config = KGlobal::config();
111	if ( args->isSet("use") \|\| (::getenv("KATE_PID")!=0) )	117	config->setGroup("General");
		118	alwaysUseInstance = config->readBoolEntry("UseInstance");
		119
		120	// now, first try to contact running kate instance if needed
		121	if ( ((args->isSet("use") \|\| alwaysUseInstance) &&
		122	!(args->isSet("force-sdi"))) \|\| (::getenv("KATE_PID")!=0) )
112	{	123	{
113	DCOPClient client;	124	DCOPClient client;
114	client.attach ();	125	client.attach ();

Lines 139-144 Link Here

(-)tdebase/kate/app/kateconfigdialog.cpp (-1 / +8 lines)
139	connect( sb_numRecentFiles, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );	139	connect( sb_numRecentFiles, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
140		140
141	// sync the konsole ?	141	// sync the konsole ?
		142
		143	cb_useInstance = new TQCheckBox(bgStartup);
		144	cb_useInstance->setText(i18n("Always use the current instance of kate to open new files"));
		145	cb_useInstance->setChecked(parent->useInstance);
		146	connect( cb_useInstance, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
		147
142	cb_syncKonsole = new TQCheckBox(bgStartup);	148	cb_syncKonsole = new TQCheckBox(bgStartup);
143	cb_syncKonsole->setText(i18n("Sync &terminal emulator with active document"));	149	cb_syncKonsole->setText(i18n("Sync &terminal emulator with active document"));
144	cb_syncKonsole->setChecked(parent->syncKonsole);	150	cb_syncKonsole->setChecked(parent->syncKonsole);
Lines 161-167 Link Here
161	this, TQT_SLOT( slotChanged() ) );	167	this, TQT_SLOT( slotChanged() ) );
162		168
163	// GROUP with the one below: "Meta-informations"	169	// GROUP with the one below: "Meta-informations"
164	bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Meta-Information"), frGeneral );	170	bgStartup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Meta-Information"), frGeneral );
165	lo->addWidget( bgStartup );	171	lo->addWidget( bgStartup );
166		172
167	// save meta infos	173	// save meta infos
Lines 409-414 Link Here
409	mainWindow->modNotification = cb_modNotifications->isChecked();	415	mainWindow->modNotification = cb_modNotifications->isChecked();
410		416
411	mainWindow->syncKonsole = cb_syncKonsole->isChecked();	417	mainWindow->syncKonsole = cb_syncKonsole->isChecked();
		418	mainWindow->syncKonsole = cb_useInstance->isChecked();
412	mainWindow->filelist->setSortType(cb_sortFiles->isChecked() ? KateFileList::sortByName : KateFileList::sortByID);	419	mainWindow->filelist->setSortType(cb_sortFiles->isChecked() ? KateFileList::sortByName : KateFileList::sortByID);
413		420
414	config->writeEntry( "Number of recent files", sb_numRecentFiles->value() );	421	config->writeEntry( "Number of recent files", sb_numRecentFiles->value() );

Lines 435-440 Link Here

(-)tdebase/kate/app/katemainwindow.cpp (+2 lines)
435		435
436	config->writeEntry("Show Full Path in Title", m_viewManager->getShowFullPath());	436	config->writeEntry("Show Full Path in Title", m_viewManager->getShowFullPath());
437		437
		438	config->writeEntry("UseInstance", m_viewManager->getShowFullPath());
		439
438	config->writeEntry("Sync Konsole", syncKonsole);	440	config->writeEntry("Sync Konsole", syncKonsole);
439		441
440	fileOpenRecent->saveEntries(config, "Recent Files");	442	fileOpenRecent->saveEntries(config, "Recent Files");

Return to bug 692