Dynamic window title and icon for tab dialog

Mic92 · May 3, 2012 · 061e7ea · 061e7ea
1 parent 5b618aa
commit 061e7ea
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 46 deletions.
diff --git a/src/copyq.qrc b/src/copyq.qrc
@@ -25,7 +25,6 @@
         <file>images/tab_commands.svg</file>
         <file>images/tab_history.svg</file>
         <file>images/tab_shortcuts.svg</file>
-        <file>images/new_tab.svg</file>
         <file>images/command_move.svg</file>
         <file>images/command_tab.svg</file>
         <file>images/copy.svg</file>

diff --git a/src/images/new_tab.svg b/src/images/new_tab.svg
diff --git a/src/include/tabdialog.h b/src/include/tabdialog.h
@@ -27,12 +27,21 @@ namespace Ui {
     class TabDialog;
 }
 
+/**
+ * Dialog for naming and renaming tabs.
+ */
 class TabDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit TabDialog(QWidget *parent = 0);
+    /** Tab dialog type (new tab or rename existing tab). */
+    typedef enum {
+        TabNew,
+        TabRename
+    } TabDialogType;
+
+    explicit TabDialog(TabDialogType type, QWidget *parent = 0);
     ~TabDialog();
 
     /** Set existing tabs for validation. */
@@ -46,10 +55,17 @@ class TabDialog : public QDialog
     QStringList m_tabs;
 
 signals:
+    /** Signal emitted if tab name is accepted. */
     void accepted(const QString &name);
 
 private slots:
     void onAccepted();
+
+    /**
+     * Validate tab name.
+     * Tab name should be non-empty and should not be in existing tab list
+     * (see setTabs()).
+     */
     void validate();
 };
 

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -874,7 +874,7 @@ void MainWindow::action(const QString &text, const Command &cmd)
 
 void MainWindow::newTab()
 {
-    TabDialog *d = new TabDialog(this);
+    TabDialog *d = new TabDialog(TabDialog::TabNew, this);
     d->setTabs(tabs());
 
     connect( d, SIGNAL(accepted(QString)),
@@ -887,8 +887,7 @@ void MainWindow::newTab()
 
 void MainWindow::renameTab()
 {
-    TabDialog *d = new TabDialog(this);
-    d->setWindowTitle(tr("CopyQ Rename Tab"));
+    TabDialog *d = new TabDialog(TabDialog::TabRename, this);
     d->setTabs(tabs());
     d->setTabName(browser()->getID());
 

diff --git a/src/tabdialog.cpp b/src/tabdialog.cpp
@@ -22,12 +22,20 @@
 
 #include <QPushButton>
 
-TabDialog::TabDialog(QWidget *parent)
+TabDialog::TabDialog(TabDialog::TabDialogType type, QWidget *parent)
     : QDialog(parent)
     , ui(new Ui::TabDialog)
 {
     ui->setupUi(this);
 
+    if (type == TabNew) {
+        setWindowTitle( tr("CopyQ New Tab") );
+        setWindowIcon( QIcon(":/images/tab_new.svg") );
+    } else {
+        setWindowTitle( tr("CopyQ Rename Tab") );
+        setWindowIcon( QIcon(":/images/tab_rename.svg") );
+    }
+
     connect( this, SIGNAL(accepted()),
              this, SLOT(onAccepted()) );
 

diff --git a/src/ui/tabdialog.ui b/src/ui/tabdialog.ui
@@ -16,13 +16,6 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle">
-   <string>CopyQ New Tab</string>
-  </property>
-  <property name="windowIcon">
-   <iconset resource="copyq.qrc">
-    <normaloff>:/images/new_tab.svg</normaloff>:/images/new_tab.svg</iconset>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">