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.

[patch] Patch updated for GIT

tdebase-kate-usemdi.diff (text/plain), 4.72 KB, created by Darrell on 2012-01-26 20:22:35 CST

(hide)

Description: Patch updated for GIT

Filename:

MIME Type:

Creator: Darrell

Created: 2012-01-26 20:22:35 CST

Size: 4.72 KB

patch

obsolete

>diff -urN tdebase/kate/app/kateconfigdialog.h tdebase.new/kate/app/kateconfigdialog.h >--- tdebase/kate/app/kateconfigdialog.h 2012-01-08 18:00:01.000000000 -0600 >+++ tdebase.new/kate/app/kateconfigdialog.h 2012-01-26 19:41:23.000000000 -0600 >@@ -66,6 +66,7 @@ > > TQCheckBox *cb_fullPath; > TQCheckBox *cb_syncKonsole; >+ TQCheckBox *cb_useInstance; > TQCheckBox *cb_sortFiles; > TQSpinBox *sb_numRecentFiles; > TQCheckBox *cb_modNotifications; >diff -urN tdebase/kate/app/katemainwindow.h tdebase.new/kate/app/katemainwindow.h >--- tdebase/kate/app/katemainwindow.h 2011-12-25 00:52:38.000000000 -0600 >+++ tdebase.new/kate/app/katemainwindow.h 2012-01-26 19:42:26.000000000 -0600 >@@ -182,6 +182,7 @@ > Kate::ToolViewManager *m_toolViewManager; > > bool syncKonsole; >+ bool useInstance; > bool modNotification; > > DCOPObject *m_dcop; >diff -urN tdebase/kate/app/katemain.cpp tdebase.new/kate/app/katemain.cpp >--- tdebase/kate/app/katemain.cpp 2011-12-25 00:52:38.000000000 -0600 >+++ tdebase.new/kate/app/katemain.cpp 2012-01-26 19:45:23.000000000 -0600 >@@ -41,6 +41,8 @@ > { "start <name>", I18N_NOOP("Start Kate with a given session"), 0 }, > { "u", 0, 0 }, > { "use", I18N_NOOP("Use a already running kate instance (if possible)"), 0 }, >+ { "f", 0, 0 }, >+ { "force-sdi", I18N_NOOP("Force single document mode if the MDI setting is enabled."), 0 }, > { "p", 0, 0 }, > { "pid <pid>", I18N_NOOP("Only try to reuse kate instance with this pid"), 0 }, > { "e", 0, 0 }, >@@ -57,9 +59,13 @@ > > extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) > { >+ KConfig * config = NULL; >+ bool alwaysUseInstance; > // here we go, construct the Kate version > TQString kateVersion = KateApp::kateVersion(); > >+ KInstance instance( "kate" ); >+ > KAboutData aboutData ("kate", I18N_NOOP("Kate"), kateVersion.latin1(), > I18N_NOOP( "Kate - Advanced Text Editor" ), KAboutData::License_LGPL_V2, > I18N_NOOP( "(c) 2000-2005 The Kate Authors" ), 0, "http://kate.kde.org"); >@@ -107,8 +113,13 @@ > // get our command line args ;) > KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); > >- // now, first try to contact running kate instance if needed >- if ( args->isSet("use") || (::getenv("KATE_PID")!=0) ) >+ config = KGlobal::config(); >+ config->setGroup("General"); >+ alwaysUseInstance = config->readBoolEntry("UseInstance"); >+ >+// now, first try to contact running kate instance if needed >+ if ( ((args->isSet("use") || alwaysUseInstance) && >+ !(args->isSet("force-sdi"))) || (::getenv("KATE_PID")!=0) ) > { > DCOPClient client; > client.attach (); >diff -urN tdebase/kate/app/kateconfigdialog.cpp tdebase.new/kate/app/kateconfigdialog.cpp >--- tdebase/kate/app/kateconfigdialog.cpp 2012-01-08 18:00:01.000000000 -0600 >+++ tdebase.new/kate/app/kateconfigdialog.cpp 2012-01-26 19:48:59.000000000 -0600 >@@ -139,6 +139,12 @@ > connect( sb_numRecentFiles, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); > > // sync the konsole ? >+ >+ cb_useInstance = new TQCheckBox(bgStartup); >+ cb_useInstance->setText(i18n("Always use the current instance of kate to open new files")); >+ cb_useInstance->setChecked(parent->useInstance); >+ connect( cb_useInstance, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); >+ > cb_syncKonsole = new TQCheckBox(bgStartup); > cb_syncKonsole->setText(i18n("Sync &terminal emulator with active document")); > cb_syncKonsole->setChecked(parent->syncKonsole); >@@ -161,7 +167,7 @@ > this, TQT_SLOT( slotChanged() ) ); > > // GROUP with the one below: "Meta-informations" >- bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Meta-Information"), frGeneral ); >+ bgStartup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Meta-Information"), frGeneral ); > lo->addWidget( bgStartup ); > > // save meta infos >@@ -409,6 +415,7 @@ > mainWindow->modNotification = cb_modNotifications->isChecked(); > > mainWindow->syncKonsole = cb_syncKonsole->isChecked(); >+ mainWindow->syncKonsole = cb_useInstance->isChecked(); > mainWindow->filelist->setSortType(cb_sortFiles->isChecked() ? KateFileList::sortByName : KateFileList::sortByID); > > config->writeEntry( "Number of recent files", sb_numRecentFiles->value() ); >diff -urN tdebase/kate/app/katemainwindow.cpp tdebase.new/kate/app/katemainwindow.cpp >--- tdebase/kate/app/katemainwindow.cpp 2012-01-08 18:00:01.000000000 -0600 >+++ tdebase.new/kate/app/katemainwindow.cpp 2012-01-26 19:49:29.000000000 -0600 >@@ -435,6 +435,8 @@ > > config->writeEntry("Show Full Path in Title", m_viewManager->getShowFullPath()); > >+ config->writeEntry("UseInstance", m_viewManager->getShowFullPath()); >+ > config->writeEntry("Sync Konsole", syncKonsole); > > fileOpenRecent->saveEntries(config, "Recent Files"); View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]