comparison mainwindow.cpp @ 61:bf57a16315bd

* Some experimental cutbacks to interface

 #include <QStatusBar>
 #include <QMessageBox>
 #include <QMenuBar>
 #include <QApplication>
 #include <QToolBar>
+#include <QToolButton>
 #include <QSettings>
 
 #include "mainwindow.h"
 #include "settingsdialog.h"
 #include "colourset.h"

     timerId = startTimer(200);
     runner = new HgRunner(this);
     runningAction = ACT_NONE;
     statusBar()->addPermanentWidget(runner);
 
-    wndTitle.sprintf("%s %s", APPNAME, APPVERSION);
-    setWindowTitle(wndTitle);
+    setWindowTitle(tr("EasyMercurial"));
 
     remoteRepoPath = "";
     workFolderPath = "";
 
     readSettings();

     exitAct->setShortcuts(QKeySequence::Quit);
     exitAct->setStatusTip(tr("Exit application"));
     exitAct -> setIconVisibleInMenu(true);
 
     //Repository actions
-    hgIncomingAct = new QAction(QIcon(":/images/incoming.png"), tr("View incoming changesets"), this);
+    hgStatAct = new QAction(QIcon(":/images/status.png"), tr("Refresh"), this);
+    hgStatAct->setStatusTip(tr("Refresh (info of) status of workfolder files"));
+
+    hgIncomingAct = new QAction(QIcon(":/images/incoming.png"), tr("Preview"), this);
     hgIncomingAct -> setStatusTip(tr("View info of changesets incoming to us from remote repository (on pull operation)"));
 
-    hgPullAct = new QAction(QIcon(":/images/pull.png"), tr("Pull from remote"), this);
+    hgPullAct = new QAction(QIcon(":/images/pull.png"), tr("Pull"), this);
     hgPullAct -> setStatusTip(tr("Pull changesets from remote repository to local repository"));
 
-    hgPushAct = new QAction(QIcon(":/images/push.png"), tr("Push to remote"), this);
+    hgPushAct = new QAction(QIcon(":/images/push.png"), tr("Push"), this);
     hgPushAct->setStatusTip(tr("Push local changesets to remote repository"));
 
     //Workfolder actions
-    hgStatAct = new QAction(QIcon(":/images/status.png"), tr("Refresh status"), this);
-    hgStatAct->setStatusTip(tr("Refresh (info of) status of workfolder files"));
-
-    hgFileDiffAct   = new QAction(QIcon(":/images/diff.png"), tr("View filediff"), this);
+    hgFileDiffAct   = new QAction(QIcon(":/images/diff.png"), tr("Diff"), this);
     hgFileDiffAct->setStatusTip(tr("Filediff: View differences between selected working folder file and local repository file"));
 
     hgFolderDiffAct   = new QAction(QIcon(":/images/folderdiff.png"), tr("View folderdiff"), this);
     hgFolderDiffAct->setStatusTip(tr("Folderdiff: View all differences between working folder files and local repository files"));
 
     hgChgSetDiffAct   = new QAction(QIcon(":/images/chgsetdiff.png"), tr("View changesetdiff"), this);
     hgChgSetDiffAct->setStatusTip(tr("Change set diff: View differences between all files of 2 repository changesets"));
 
-    hgRevertAct = new QAction(QIcon(":/images/undo.png"), tr("Undo changes"), this);
+    hgRevertAct = new QAction(QIcon(":/images/undo.png"), tr("Revert"), this);
     hgRevertAct->setStatusTip(tr("Undo selected working folder file changes (return to local repository version)"));
 
-    hgAddAct = new QAction(QIcon(":/images/add.png"), tr("Add files"), this);
+    hgAddAct = new QAction(QIcon(":/images/add.png"), tr("Add"), this);
     hgAddAct -> setStatusTip(tr("Add working folder file(s) (selected or all yet untracked) to local repository (on next commit)"));
 
-    hgRemoveAct = new QAction(QIcon(":/images/remove.png"), tr("Remove file"), this);
+    hgRemoveAct = new QAction(QIcon(":/images/remove.png"), tr("Remove"), this);
     hgRemoveAct -> setStatusTip(tr("Remove selected working folder file from local repository (on next commit)"));
 
-    hgUpdateAct = new QAction(QIcon(":/images/update.png"), tr("Update working folder"), this);
+    hgUpdateAct = new QAction(QIcon(":/images/update.png"), tr("Update"), this);
     hgUpdateAct->setStatusTip(tr("Update working folder from local repository"));
 
-    hgCommitAct = new QAction(QIcon(":/images/commit.png"), tr("Commit / Save change(s)"), this);
+    hgCommitAct = new QAction(QIcon(":/images/commit.png"), tr("Commit"), this);
     hgCommitAct->setStatusTip(tr("Save selected file(s) or all changed files in working folder (and all subfolders) to local repository"));
 
     hgMergeAct = new QAction(QIcon(":/images/merge.png"), tr("Merge"), this);
     hgMergeAct->setStatusTip(tr("Merge two local repository changesets to working folder"));
 

     fileToolBar = addToolBar(tr("File"));
     fileToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
     fileToolBar -> addAction(settingsAct);
     fileToolBar -> addAction(hgStatAct);
     fileToolBar -> addSeparator();
-    fileToolBar -> addAction(hgChgSetDiffAct);
+//    fileToolBar -> addAction(hgChgSetDiffAct);
     fileToolBar -> setMovable(false);
 
     repoToolBar = addToolBar(tr(REPOMENU_TITLE));
     repoToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
     repoToolBar->addAction(hgIncomingAct);

     repoToolBar -> setMovable(false);
 
     workFolderToolBar = addToolBar(tr(WORKFOLDERMENU_TITLE));
     addToolBar(Qt::LeftToolBarArea, workFolderToolBar);
     workFolderToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
-    workFolderToolBar->addSeparator();
+//    workFolderToolBar->addSeparator();
     workFolderToolBar->addAction(hgFileDiffAct);
-    workFolderToolBar->addAction(hgFolderDiffAct);
+//    workFolderToolBar->addAction(hgFolderDiffAct);
     workFolderToolBar->addSeparator();
     workFolderToolBar->addAction(hgRevertAct);
     workFolderToolBar->addAction(hgUpdateAct);
     workFolderToolBar->addAction(hgCommitAct);
     workFolderToolBar->addAction(hgMergeAct);
     workFolderToolBar->addSeparator();
     workFolderToolBar->addAction(hgAddAct);
     workFolderToolBar->addAction(hgRemoveAct);
     workFolderToolBar -> setMovable(false);
+
+    foreach (QToolButton *tb, findChildren<QToolButton *>()) {
+        tb->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+    }
 }
 
 
 void MainWindow::createStatusBar()
 {

 
 void MainWindow::readSettings()
 {
     QDir workFolder;
 
-    QSettings settings("hgexplorer", "hgexplorer");
+    QSettings settings;
 
     remoteRepoPath = settings.value("remoterepopath", "").toString();
     workFolderPath = settings.value("workfolderpath", "").toString();
     if (!workFolder.exists(workFolderPath))
     {

 }
 
 
 void MainWindow::writeSettings()
 {
-    QSettings settings("hgexplorer", "hgexplorer");
+    QSettings settings;
     settings.setValue("pos", pos());
     settings.setValue("size", size());
     settings.setValue("remoterepopath", remoteRepoPath);
     settings.setValue("workfolderpath", workFolderPath);