Mercurial > octave-nkf

changeset 13672:c9501268a194

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filename with or without full path in tabs of the editor
author ttl <ttl@justmail.de>
date Tue, 13 Sep 2011 17:44:34 +0200
parents c6dc85026aa6
children 6a11fd0efa16
files gui/src/FileEditorMdiSubWindow.cpp gui/src/FileEditorMdiSubWindow.h gui/src/OctaveGUI.cpp gui/src/SettingsDialog.cpp gui/src/SettingsDialog.ui gui/src/WelcomeWizard.ui
diffstat 6 files changed, 32 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/gui/src/FileEditorMdiSubWindow.cpp	Sat Sep 10 22:04:40 2011 +0200
+++ b/gui/src/FileEditorMdiSubWindow.cpp	Tue Sep 13 17:44:34 2011 +0200
@@ -69,15 +69,20 @@
 }
 
 void
-FileEditorMdiSubWindow::handleModificationChanged(bool modified)
+FileEditorMdiSubWindow::newWindowTitle(bool modified)
 {
+  QString title(m_fileName);
+  if ( !m_longTitle )
+    {
+      QFileInfo file(m_fileName);
+      title = file.fileName();
+    }
   if ( modified )
     {
-      QString title(m_fileName);
       setWindowTitle(title.prepend("* "));
     }
   else
-     setWindowTitle (m_fileName);
+     setWindowTitle (title);
 }
 
 void
@@ -127,7 +132,7 @@
   QApplication::restoreOverrideCursor ();
 
   m_fileName = fileName;
-  setWindowTitle (fileName);
+  newWindowTitle (false); // window title (no modification)
   m_statusBar->showMessage (tr ("File loaded."), 2000);
   m_editor->setModified (false); // loaded file is not modified yet
 }
@@ -140,7 +145,7 @@
         return; // existing file not saved and creating new file canceled by user
       }
     m_fileName = UNNAMED_FILE;
-    setWindowTitle (m_fileName);
+    newWindowTitle (false); // window title (no modification)
     m_editor->setText ("");
     m_editor->setModified (false); // new file is not modified yet
 }
@@ -208,8 +213,8 @@
   QApplication::setOverrideCursor (Qt::WaitCursor);
   out << m_editor->text ();
   QApplication::restoreOverrideCursor ();
-  m_fileName = saveFileName;     // save file name for later use
-  setWindowTitle(m_fileName);    // set the window title to actual file name
+  m_fileName = saveFileName;  // save file name for later use
+  newWindowTitle(false);      // set the window title to actual file name (not modified)
   m_statusBar->showMessage (tr ("File %1 saved").arg(m_fileName), 2000);
   m_editor->setModified (false); // files is save -> not modified
 }
@@ -279,8 +284,8 @@
             m_editor->insertAt("%",i,0);
           else
             {
-              QString line(m_editor->text(i));
-              if ( line.startsWith("%") )
+               QString line(m_editor->text(i));
+               if ( line.startsWith("%") )
                 {
                   m_editor->setSelection(i,0,i,1);
                   m_editor->removeSelectedText();
@@ -440,6 +445,7 @@
       m_editor->setAutoCompletionThreshold (3);
     }
   m_editor->setUtf8 (true);
+  m_longTitle = settings->value ("editor/longWindowTitle",true).toBool ();
 
   // The Actions
 
@@ -582,10 +588,10 @@
   connect (saveAsAction, SIGNAL (hovered ()), this,SLOT (showToolTipSaveAs ()));
 
   // connect modified signal
-  connect (m_editor, SIGNAL (modificationChanged(bool)), this, SLOT (handleModificationChanged(bool)) );
+  connect (m_editor, SIGNAL (modificationChanged(bool)), this, SLOT (newWindowTitle(bool)) );
 
   m_fileName = "";
-  setWindowTitle (m_fileName);
+  newWindowTitle (false);
   setWindowIcon(QIcon::fromTheme("accessories-text-editor",style->standardIcon (QStyle::SP_FileIcon)));
   show ();
 }
--- a/gui/src/FileEditorMdiSubWindow.h	Sat Sep 10 22:04:40 2011 +0200
+++ b/gui/src/FileEditorMdiSubWindow.h	Tue Sep 13 17:44:34 2011 +0200
@@ -78,15 +78,17 @@
   QsciScintilla *m_editor;
   QStatusBar *m_statusBar;
   QString m_fileName;
+  QString m_fileNameShort;
   TerminalEmulation* m_terminalEmulation;
   QAction* m_copyAction;
   QAction* m_cutAction;
   MainWindow* m_mainWindow;
   int m_markerBookmark;
   bool m_modified;
+  bool m_longTitle;
 
 private slots:
-  void handleModificationChanged(bool modified);
+  void newWindowTitle(bool modified);
   void handleMarginClicked(int line, int margin, Qt::KeyboardModifiers state);
   void handleCopyAvailable(bool enableCopy);
   void runFile();
--- a/gui/src/OctaveGUI.cpp	Sat Sep 10 22:04:40 2011 +0200
+++ b/gui/src/OctaveGUI.cpp	Tue Sep 13 17:44:34 2011 +0200
@@ -48,6 +48,7 @@
           settings->setValue ("editor/codeCompletion", true);
           settings->setValue ("editor/fontName", "Monospace");
           settings->setValue ("editor/fontSize", 10);
+          settings->setValue ("editor/shortWindowTitle", true);
           settings->setValue ("showFilenames", true);
           settings->setValue ("showFileSize", false);
           settings->setValue ("showFileType", false);
--- a/gui/src/SettingsDialog.cpp	Sat Sep 10 22:04:40 2011 +0200
+++ b/gui/src/SettingsDialog.cpp	Tue Sep 13 17:44:34 2011 +0200
@@ -21,6 +21,7 @@
   ui->editor_codeCompletion->setChecked (settings->value ("editor/codeCompletion",true).toBool () );
   ui->editor_fontName->setCurrentFont (QFont (settings->value ("editor/fontName","Courier").toString()) );
   ui->editor_fontSize->setValue (settings->value ("editor/fontSize",10).toInt ());
+  ui->editor_longWindowTitle->setChecked (settings->value ("editor/longWindowTitle",true).toBool ());
   ui->showFilenames->setChecked (settings->value ("showFilenames").toBool());
   ui->showFileSize->setChecked (settings->value ("showFileSize").toBool());
   ui->showFileType->setChecked (settings->value ("showFileType").toBool());
@@ -58,6 +59,7 @@
   settings->setValue ("editor/codeCompletion", ui->editor_codeCompletion->isChecked ());
   settings->setValue ("editor/fontName", ui->editor_fontName->currentFont().family());
   settings->setValue ("editor/fontSize", ui->editor_fontSize->value());
+  settings->setValue ("editor/longWindowTitle", ui->editor_longWindowTitle->isChecked());
   settings->setValue ("showFilenames", ui->showFilenames->isChecked ());
   settings->setValue ("showFileSize", ui->showFileSize->isChecked ());
   settings->setValue ("showFileType", ui->showFileType->isChecked ());
--- a/gui/src/SettingsDialog.ui	Sat Sep 10 22:04:40 2011 +0200
+++ b/gui/src/SettingsDialog.ui	Tue Sep 13 17:44:34 2011 +0200
@@ -32,7 +32,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="chatTab">
       <attribute name="title">
@@ -203,6 +203,13 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QCheckBox" name="editor_longWindowTitle">
+           <property name="text">
+            <string>Show complete path in window title</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
        <item row="2" column="0">
--- a/gui/src/WelcomeWizard.ui	Sat Sep 10 22:04:40 2011 +0200
+++ b/gui/src/WelcomeWizard.ui	Tue Sep 13 17:44:34 2011 +0200
@@ -29,7 +29,7 @@
    <item>
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>4</number>
      </property>
      <widget class="QWidget" name="page">
       <layout class="QVBoxLayout" name="verticalLayout">