From f44b5bc2595da5206e4aeb5145a61c48dea1585e Mon Sep 17 00:00:00 2001
From: Rafael <Syping@users.noreply.github.com>
Date: Thu, 14 Apr 2016 01:59:41 +0200
Subject: [PATCH] Ui update

---
 OptionsDialog.cpp   |  1 +
 OptionsDialog.ui    |  9 +++++++++
 SavegameWidget.cpp  |  4 ++--
 SnapmaticWidget.cpp |  4 ++--
 UserInterface.cpp   |  3 +++
 UserInterface.ui    | 33 ++++++++++++++++++++++++++-------
 6 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/OptionsDialog.cpp b/OptionsDialog.cpp
index bde5f52..c233953 100755
--- a/OptionsDialog.cpp
+++ b/OptionsDialog.cpp
@@ -33,6 +33,7 @@ OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) :
     ui(new Ui::OptionsDialog)
 {
     ui->setupUi(this);
+    ui->tabWidget->setCurrentIndex(0);
     setupTreeWidget();
     setupLanguageBox();
 }
diff --git a/OptionsDialog.ui b/OptionsDialog.ui
index e0522fb..c552f87 100755
--- a/OptionsDialog.ui
+++ b/OptionsDialog.ui
@@ -94,6 +94,15 @@
        </property>
        <item>
         <widget class="QTreeWidget" name="twPlayers">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Plain</enum>
+         </property>
+         <property name="lineWidth">
+          <number>0</number>
+         </property>
          <property name="editTriggers">
           <set>QAbstractItemView::NoEditTriggers</set>
          </property>
diff --git a/SavegameWidget.cpp b/SavegameWidget.cpp
index 7e43436..5e4edc8 100755
--- a/SavegameWidget.cpp
+++ b/SavegameWidget.cpp
@@ -196,14 +196,14 @@ void SavegameWidget::contextMenuEvent(QContextMenuEvent *ev)
         contextMenu.addSeparator();
         if (!ui->cbSelected->isChecked()) { contextMenu.addAction(tr("&Select"), this, SLOT(savegameSelected())); }
         if (ui->cbSelected->isChecked()) { contextMenu.addAction(tr("&Deselect"), this, SLOT(savegameSelected())); }
-        contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+S"));
+        contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A"));
         contextMenu.addAction(tr("&Deselect All"), this, SLOT(deselectAllWidgets()), QKeySequence::fromString("Ctrl+D"));
     }
     else
     {
         contextMenu.addSeparator();
         contextMenu.addAction(tr("&Select"), this, SLOT(savegameSelected()));
-        contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+S"));
+        contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A"));
     }
     //ui->SavegameFrame->setStyleSheet(QString("QFrame#SavegameFrame{background-color: rgb(%1, %2, %3)}QLabel#labSavegameStr{color: rgb(%4, %5, %6)}").arg(QString::number(highlightBackColor.red()), QString::number(highlightBackColor.green()), QString::number(highlightBackColor.blue()), QString::number(highlightTextColor.red()), QString::number(highlightTextColor.green()), QString::number(highlightTextColor.blue())));
     contextMenu.exec(ev->globalPos());
diff --git a/SnapmaticWidget.cpp b/SnapmaticWidget.cpp
index e6f146f..93a5f3b 100755
--- a/SnapmaticWidget.cpp
+++ b/SnapmaticWidget.cpp
@@ -213,14 +213,14 @@ void SnapmaticWidget::contextMenuEvent(QContextMenuEvent *ev)
         contextMenu.addSeparator();
         if (!ui->cbSelected->isChecked()) { contextMenu.addAction(tr("&Select"), this, SLOT(pictureSelected())); }
         if (ui->cbSelected->isChecked()) { contextMenu.addAction(tr("&Deselect"), this, SLOT(pictureSelected())); }
-        contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+S"));
+        contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A"));
         contextMenu.addAction(tr("&Deselect All"), this, SLOT(deselectAllWidgets()), QKeySequence::fromString("Ctrl+D"));
     }
     else
     {
         contextMenu.addSeparator();
         contextMenu.addAction(tr("&Select"), this, SLOT(pictureSelected()));
-        contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+S"));
+        contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A"));
     }
     //ui->SnapmaticFrame->setStyleSheet(QString("QFrame#SnapmaticFrame{background-color: rgb(%1, %2, %3)}QLabel#labPicStr{color: rgb(%4, %5, %6)}").arg(QString::number(highlightBackColor.red()), QString::number(highlightBackColor.green()), QString::number(highlightBackColor.blue()), QString::number(highlightTextColor.red()), QString::number(highlightTextColor.green()), QString::number(highlightTextColor.blue())));
     contextMenu.exec(ev->globalPos());
diff --git a/UserInterface.cpp b/UserInterface.cpp
index 0b51dbe..d248b36 100755
--- a/UserInterface.cpp
+++ b/UserInterface.cpp
@@ -46,6 +46,7 @@ UserInterface::UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, D
     profileOpen = 0;
     profileUI = 0;
     ui->menuProfile->setEnabled(false);
+    ui->actionSelect_profile->setEnabled(false);
     defaultWindowTitle = tr("gta5sync - %1");
 
     this->setWindowTitle(defaultWindowTitle.arg(tr("Select Profile")));
@@ -173,6 +174,7 @@ void UserInterface::closeProfile()
     {
         profileOpen = false;
         ui->menuProfile->setEnabled(false);
+        ui->actionSelect_profile->setEnabled(false);
         ui->swProfile->removeWidget(profileUI);
         profileUI->deleteLater();
         delete profileUI;
@@ -219,6 +221,7 @@ void UserInterface::on_actionAbout_gta5sync_triggered()
 void UserInterface::profileLoaded()
 {
     ui->menuProfile->setEnabled(true);
+    ui->actionSelect_profile->setEnabled(true);
 }
 
 void UserInterface::on_actionSelect_all_triggered()
diff --git a/UserInterface.ui b/UserInterface.ui
index 70f7062..c95c803 100755
--- a/UserInterface.ui
+++ b/UserInterface.ui
@@ -135,7 +135,9 @@
     <property name="title">
      <string>&amp;File</string>
     </property>
+    <addaction name="actionOpen_File"/>
     <addaction name="actionSelect_profile"/>
+    <addaction name="separator"/>
     <addaction name="actionExit"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
@@ -171,12 +173,18 @@
     <string>&amp;About gta5sync</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+A</string>
+    <string>Ctrl+P</string>
    </property>
   </action>
   <action name="actionExit">
+   <property name="icon">
+    <iconset theme="application-exit"/>
+   </property>
    <property name="text">
-    <string>&amp;Close</string>
+    <string>&amp;Exit</string>
+   </property>
+   <property name="toolTip">
+    <string>Exit</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Q</string>
@@ -184,10 +192,10 @@
   </action>
   <action name="actionSelect_profile">
    <property name="text">
-    <string>Select &amp;Profile</string>
+    <string>Close &amp;Profile</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+P</string>
+    <string>Ctrl+End</string>
    </property>
   </action>
   <action name="actionOptions">
@@ -195,7 +203,7 @@
     <string>&amp;Settings</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+O</string>
+    <string>Ctrl+S</string>
    </property>
   </action>
   <action name="actionSelect_all">
@@ -203,7 +211,7 @@
     <string>Select &amp;All</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+S</string>
+    <string>Ctrl+A</string>
    </property>
   </action>
   <action name="actionDeselect_all">
@@ -227,7 +235,7 @@
     <string>&amp;Remove selected</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+R</string>
+    <string>Ctrl+Del</string>
    </property>
   </action>
   <action name="action_Import">
@@ -238,6 +246,17 @@
     <string>Ctrl+I</string>
    </property>
   </action>
+  <action name="actionOpen_File">
+   <property name="icon">
+    <iconset theme="document-open"/>
+   </property>
+   <property name="text">
+    <string>&amp;Open File...</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections>