[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdesdk/kate/plugins/filebrowser
From:       Dominik Haumann <dhdev () gmx ! de>
Date:       2009-07-07 18:39:56
Message-ID: 1246991996.849590.31663.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 992802 by dhaumann:

reintroduce autosync feature again in config menu
restore config correctly


 M  +31 -19    katefilebrowser.cpp  
 M  +3 -5      katefilebrowser.h  


--- trunk/KDE/kdesdk/kate/plugins/filebrowser/katefilebrowser.cpp #992801:992802
@@ -102,6 +102,7 @@
   m_filter->setWhatsThis(i18n("Enter a name filter to limit which files are \
displayed."));  
   connect(m_dirOperator, SIGNAL(fileSelected(const KFileItem&)), this, \
SLOT(fileSelected(const KFileItem&))); +  connect(m_mainWindow, \
SIGNAL(viewChanged()), this, SLOT(autoSyncFolder()));  }
 
 KateFileBrowser::~KateFileBrowser()
@@ -110,24 +111,6 @@
 //END Constroctor/Destrctor
 
 //BEGIN Public Methods
-void KateFileBrowser::readSessionConfig(KConfigBase *config, const QString & name)
-{
-
-  KConfigGroup cgView(config, name + ":view");
-  m_dirOperator->setViewConfig(cgView);
-
-  KConfigGroup cgDir(config, name + ":dir");
-  m_dirOperator->readConfig(cgDir);
-  m_dirOperator->setView(KFile::Default);
-
-  KConfigGroup cg(config, name);
-  m_urlNavigator->setUrl(cg.readPathEntry("location", QDir::homePath()));
-  setDir(cg.readPathEntry("location", QDir::homePath()));
-  m_dirOperator->setShowHiddenFiles(cg.readEntry("show hidden files", false));
-
-  m_filter->setHistoryItems(cg.readEntry("filter history", QStringList()), true);
-}
-
 void KateFileBrowser::setupToolbar()
 {
   // remove all actions from the toolbar (there should be none)
@@ -174,10 +157,31 @@
   optionsMenu->addSeparator();
   optionsMenu->addAction(m_dirOperator->actionCollection()->action("show hidden"));
 
+  // action for synchronising the dir operator with the current document path
+  m_autoSyncFolder = new KAction(this);
+  m_autoSyncFolder->setCheckable(true);
+  m_autoSyncFolder->setText(i18n("Automatically synchronize with current \
document")); +  m_autoSyncFolder->setIcon(KIcon("system-switch-user"));
+  connect(m_autoSyncFolder, SIGNAL(triggered()), this, SLOT(autoSyncFolder()));
+  optionsMenu->addAction(m_autoSyncFolder);
+
   m_toolbar->addSeparator();
   m_toolbar->addAction(optionsMenu);
 }
 
+void KateFileBrowser::readSessionConfig(KConfigBase *config, const QString & name)
+{
+  KConfigGroup cgDir(config, name + ":dir");
+  m_dirOperator->readConfig(cgDir);
+  m_dirOperator->setView(KFile::Default);
+
+  KConfigGroup cg(config, name);
+  m_urlNavigator->setUrl(cg.readPathEntry("location", QDir::homePath()));
+  setDir(cg.readPathEntry("location", QDir::homePath()));
+  m_autoSyncFolder->setChecked(cg.readEntry("auto sync folder", false));
+  m_filter->setHistoryItems(cg.readEntry("filter history", QStringList()), true);
+}
+
 void KateFileBrowser::writeSessionConfig(KConfigBase *config, const QString & name)
 {
   KConfigGroup cgDir(config, name + ":dir");
@@ -185,7 +189,7 @@
 
   KConfigGroup cg = KConfigGroup(config, name);
   cg.writePathEntry("location", m_urlNavigator->url().url());
-  cg.writeEntry("show hidden files", m_dirOperator->showHiddenFiles());
+  cg.writeEntry("auto sync folder", m_autoSyncFolder->isChecked());
   cg.writeEntry("filter history", m_filter->historyItems());
 }
 
@@ -282,6 +286,14 @@
 //   kDebug(13001)<<"... setActiveDocumentDir() DONE!";
 }
 
+void KateFileBrowser::autoSyncFolder()
+{
+  if (m_autoSyncFolder->isChecked()) {
+    setActiveDocumentDir();
+  }
+}
+
+
 void KateFileBrowser::selectorViewChanged(QAbstractItemView * newView)
 {
   newView->setSelectionMode(QAbstractItemView::ExtendedSelection);
--- trunk/KDE/kdesdk/kate/plugins/filebrowser/katefilebrowser.h #992801:992802
@@ -31,16 +31,12 @@
 
 class QAbstractItemView;
 class KateBookmarkHandler;
-
+class KAction;
 class KActionCollection;
-class KActionSelector;
 class KDirOperator;
 class KFileItem;
 class KHistoryComboBox;
 class KToolBar;
-class QToolButton;
-class QCheckBox;
-class QSpinBox;
 
 class KUrlNavigator;
 /*
@@ -81,6 +77,7 @@
     void updateDirOperator( const KUrl& u );
     void updateUrlNavigator( const KUrl& u );
     void setActiveDocumentDir();
+    void autoSyncFolder();
 
   protected:
     KUrl activeDocumentUrl();
@@ -99,6 +96,7 @@
     KUrlNavigator *m_urlNavigator;
     KDirOperator * m_dirOperator;
     KHistoryComboBox * m_filter;
+    KAction *m_autoSyncFolder;
 
     Kate::MainWindow *m_mainWindow;
 };


[prev in list] [next in list] [prev in thread] [next in thread]