Change fast passwords place for OSX

Author: elemc

config.h.in

@@ -6,4 +6,4 @@
 #include <QDebug>
 #endif
 
-#define DEFAULT_ICON_THEME "oxygen-internal"
+#define DEFAULT_ICON_THEME "classic-internal"

model/basketmodel.cpp

@@ -812,6 +812,7 @@ void BasketModel::reloadSettings()
 {
     QSettings set;
     itemsColor = set.value(tr("ItemColor"), QColor(Qt::darkBlue)).value<QColor>();
+    emit primaryChanged(); 
 }
 void BasketModel::initRoot()
 {

src/mainwindow.cpp

@@ -696,15 +696,25 @@ void MainWindow::generateContextPrimaries()
     }
 
     if ( primaryActions->actions().size() > 0 ) {
+
+        bool inTray = true;
 #ifdef Q_WS_MAC
-        foreach ( QAction *act, primaryActions->actions() ) {
-            macDockMenu->addAction(act);
+        QSettings set;
+        QString fastPlace = set.value("FastPasswordsPlace", QString("dock")).toString();
+    
+        if ( fastPlace.contains( QString("dock") ) ) {
+
+            foreach ( QAction *act, primaryActions->actions() ) {
+                macDockMenu->addAction(act);
+            }
+            qt_mac_set_dock_menu(macDockMenu);
         }
-        qt_mac_set_dock_menu(macDockMenu);
-#else
-        trayIconMenu->insertActions(minimizeAction, primaryActions->actions());
-        trayIconMenu->insertSeparator(minimizeAction);
+        inTray = fastPlace.contains ( QString("tray") );
 #endif
+        if ( inTray ) {
+            trayIconMenu->insertActions(minimizeAction, primaryActions->actions());
+            trayIconMenu->insertSeparator(minimizeAction);
+        }
     }
 }
 void MainWindow::primaryActionsTriggered(QAction *act)

src/settingsdialog.cpp

@@ -43,9 +43,20 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
 #endif
     m_ui->comboBoxIconTheme->addItem( trUtf8("Современная (oxygen)"), QString("oxygen-internal") ); 
     m_ui->comboBoxIconTheme->addItem( trUtf8("Классическая"), QString("classic-internal") );
+    m_ui->comboBoxIconTheme->setCurrentIndex( getIconThemeIndex( iconTheme) );
 
+    /* Mac OS X fast passwords */
+#if defined(Q_WS_MAC)
+    QString fastPlace = set.value(QString("FastPasswordsPlace"), QString("dock")).toString();
 
-    m_ui->comboBoxIconTheme->setCurrentIndex( getIconThemeIndex( iconTheme) ); 
+    m_ui->comboBoxFastPasswords->addItem ( trUtf8("Dock + Tray"), QString("dock_tray") );
+    m_ui->comboBoxFastPasswords->addItem ( trUtf8("Dock"), QString("dock") );
+    m_ui->comboBoxFastPasswords->addItem ( trUtf8("Tray"), QString("tray") );
+
+    m_ui->comboBoxFastPasswords->setCurrentIndex( getFastPlace ( fastPlace ) );
+#else
+    m_ui->groupBoxOSSpecified->hide();
+#endif
 }
 SettingsDialog::~SettingsDialog()
 {
@@ -110,6 +121,11 @@ void SettingsDialog::on_buttonBox_clicked(QAbstractButton* button)
         QString themeName = m_ui->comboBoxIconTheme->itemData( 
                             m_ui->comboBoxIconTheme->currentIndex() ).toString();
         set.setValue("IconTheme", themeName );
+#if defined(Q_WS_MAC)
+        QString fastPlace = m_ui->comboBoxFastPasswords->itemData(
+                            m_ui->comboBoxFastPasswords->currentIndex() ).toString();
+        set.setValue("FastPasswordsPlace", fastPlace);
+#endif
 
         QIcon::setThemeName( themeName );
 
@@ -160,3 +176,18 @@ int SettingsDialog::getIconThemeIndex (const QString &themeName) const
 
     return it_idx;
 }
+#if defined(Q_WS_MAC)
+int SettingsDialog::getFastPlace ( const QString &place ) const
+{
+    int idx = -1;
+    if ( place == QString("dock_tray") )
+        idx = 0;
+    else if ( place == QString("dock") )
+        idx = 1;
+    else if ( place == QString("tray") )
+        idx = 2;
+    else
+        idx = 1;
+    return idx;
+}
+#endif

src/settingsdialog.h

@@ -31,6 +31,9 @@ class SettingsDialog : public QDialog {
 
     void setColorToItLabel(QColor &clr);
     int getIconThemeIndex(const QString &themeName) const;
+#if defined(Q_WS_MAC)
+    int getFastPlace( const QString &place ) const;
+#endif
 
 private slots:
     void on_buttonBox_clicked(QAbstractButton* button);

ui/settingsdialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>480</width>
-    <height>364</height>
+    <width>470</width>
+    <height>541</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -174,6 +174,29 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QGroupBox" name="groupBoxOSSpecified">
+     <property name="title">
+      <string>Специфичные настройки</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_5">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_6">
+        <item>
+         <widget class="QLabel" name="labelFastPassword">
+          <property name="text">
+           <string>Расположение &quot;быстрых паролей&quot;:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="comboBoxFastPasswords"/>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">