reduce icons size.

add Linux/*BSD desktop file.
can use make install now.

Author: librehat

README.md

@@ -9,7 +9,7 @@ The odd minor version number (0.**X**) indicates development version. And the ev
 
 - This is not a standalone programme. It works along with ss-local binary from [shadowsocks-libev project](https://github.com/madeye/shadowsocks-libev).
 - The gui-config.json file is compatible with [shadowsocks-gui](https://github.com/shadowsocks/shadowsocks-gui). But add a new value named "app" to specify `ss-local` programme.
-- gui-config.json is located under /etc/shadowsocks/ for UNIX users, but under this app's directory for Windows users.
+- gui-config.json is located under ~/.config/shadowsocks for UNIX users, but under this app's directory for Windows users.
 - Although it's recommended to use both 64-bit ss-local and ss-qt5 if you're running 64-bit OS. Feel free to use 32-bit ss-local together with 64-bit ss-qt5, vice versa.
 
 ## BUILD FROM SOURCE ##

icon/colourful_icon.png

@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
-        <file>icon/colourful_icon.png</file>
+        <file>icon/shadowsocks-qt5.png</file>
         <file>icon/mono_icon.png</file>
         <file>icon/running_icon.png</file>
     </qresource>

icon/mono_icon.png

@@ -1,11 +1,30 @@
 #include "mainwindow.h"
+#include "profiles.h"
+#include "ss_process.h"
 #include <QApplication>
 
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     MainWindow w;
-    w.show();
+
+    /*
+     * autostart if there is a valid profile activated already.
+     * and don't show the mainwindow
+     */
+     //validate first
+     //TODO: more accurate
+     if (w.current_profile.local_port.toInt() > 0 &&
+            w.current_profile.method != NULL &&
+            w.current_profile.password != NULL &&
+            w.current_profile.server != NULL &&
+            w.current_profile.server_port.toInt() > 0 &&
+            w.current_profile.timeout.toInt() > 0) {
+        w.ss_local.start(w.current_profile);
+     }
+     else {//profile is not valid
+        w.show();
+     }
 
     return a.exec();
 }

icon/running_icon.png

@@ -1,3 +1,4 @@
+#include <QDesktopWidget>
 #include <QFileDialog>
 #include <QFile>
 #include <QStandardPaths>
@@ -30,7 +31,7 @@ MainWindow::MainWindow(QWidget *parent) :
 #ifdef _WIN32
     jsonconfigFile = QCoreApplication::applicationDirPath() + "/gui-config.json";
 #else
-    jsonconfigFile = "/etc/shadowsocks/gui-config.json";
+    jsonconfigFile = QDir::homePath() + "/.config/shadowsocks/gui-config.json";
 #endif
     m_profile = new Profiles(jsonconfigFile);
     ui->sslocalEdit->setText(detectSSLocal());
@@ -42,10 +43,12 @@ MainWindow::MainWindow(QWidget *parent) :
     systrayMenu.addAction("Start/Stop", this, SLOT(startbuttonPressed()));
     systrayMenu.addAction("Exit", this, SLOT(close()));
     systray.setIcon(QIcon(":/icon/mono_icon.png"));
+    systray.setToolTip(QString("Shadowsocks-Qt5"));
     systray.setContextMenu(&systrayMenu);
     systray.show();
 
-    autoStartSSLocal();
+    //Move to the center of the screen
+    this->move(QApplication::desktop()->screen()->rect().center() - this->rect().center());
 }
 
 MainWindow::~MainWindow()
@@ -166,26 +169,6 @@ void MainWindow::deleteProfile()
     ui->serverComboBox->removeItem(i);
 }
 
-/*
- * autostart if there is a valid profile activated already.
- * then minimize itself into systray.
- */
-void MainWindow::autoStartSSLocal()
-{
-    //validate first
-    //TODO: more accurate
-    if (current_profile.local_port.toInt() > 0 &&
-            current_profile.method != NULL &&
-            current_profile.password != NULL &&
-            current_profile.server != NULL &&
-            current_profile.server_port.toInt() > 0 &&
-            current_profile.timeout.toInt() > 0)
-    {
-        ss_local.start(current_profile);
-        hide();
-    }
-}
-
 void MainWindow::processStarted()
 {
     ui->startButton->setUserData(0, (QObjectUserData *)1);
@@ -207,10 +190,13 @@ void MainWindow::processStopped()
 void MainWindow::showorhideWindow()
 {
     if (this->isVisible()) {
-        hide();
+        this->hide();
     }
     else {
-        show();
+        this->show();
+        this->setWindowState(Qt::WindowActive);
+        this->activateWindow();
+        ui->logButton->setFocus();
     }
 }
 
@@ -220,3 +206,10 @@ void MainWindow::systrayActivated(QSystemTrayIcon::ActivationReason r)
         showorhideWindow();
     }
 }
+
+void MainWindow::changeEvent(QEvent *e)
+{
+    if (e->type()==QEvent::WindowStateChange && this->isMinimized()) {
+        this->hide();
+    }
+}

icon/shadowsocks-qt5.png

@@ -19,7 +19,8 @@ class MainWindow : public QMainWindow
 public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
-    QProcess sslocal;
+    SS_Process ss_local;
+    SSProfile current_profile;
 
 signals:
     void currentProfileChanged(int);
@@ -33,7 +34,6 @@ public slots:
     void showLogDialogue();
     void deleteProfile();
     void revertbuttonPressed();
-    void autoStartSSLocal();
     void processStarted();
     void processStopped();
     void systrayActivated(QSystemTrayIcon::ActivationReason);
@@ -44,11 +44,12 @@ public slots:
     LogDialogue logdlg;
     QString detectSSLocal();
     QString jsonconfigFile;
-    SSProfile current_profile;
     Profiles *m_profile;
-    SS_Process ss_local;
     QSystemTrayIcon systray;
     QMenu systrayMenu;
+
+protected:
+    void changeEvent(QEvent *);
 };
 
 #endif // MAINWINDOW_H

icons.qrc

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>340</width>
-    <height>252</height>
+    <height>250</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -21,7 +21,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="icons.qrc">
-    <normaloff>:/icon/colourful_icon.png</normaloff>:/icon/colourful_icon.png</iconset>
+    <normaloff>:/icon/shadowsocks-qt5.png</normaloff>:/icon/shadowsocks-qt5.png</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout">

main.cpp

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Shadowsocks-Qt5
+GenericName=Shadowsocks-Qt5
+Comment=A GUI Client for Shadowsocks
+Exec=ss-qt5
+Icon=shadowsocks-qt5
+Terminal=false
+Type=Application
+Categories=Network;
+StartupNotify=true

mainwindow.cpp

@@ -24,10 +24,36 @@ HEADERS  += mainwindow.h \
 FORMS    += mainwindow.ui \
     logdialogue.ui
 
-OTHER_FILES += \
-    README.md \
-    gui-config.json
+OTHER_FILES += README.md \
+    gui-config.json \
+    shadowsocks-qt5.desktop
+
+binary_path = /usr/bin
+desktop.path = /usr/share/applications
+desktop.files = shadowsocks-qt5.desktop
+ssicon.path = /usr/share/icons/hicolor/512x512/apps
+ssicon.files = icon/shadowsocks-qt5.png
+
+!equals($$(INSTALL_PREFIX), "") {
+    unix: {
+        binary_path = $$(INSTALL_PREFIX)/bin
+        desktop.path = $$(INSTALL_PREFIX)/share/applications
+        ssicon.path = $$(INSTALL_PREFIX)/share/icons/hicolor/512x512/apps
+    }
+    else: binary_path = $$(INSTALL_PREFIX)
+}
+
+target.path = $$binary_path
+
+unix: gui_conf.path = $$(HOME)/.config/shadowsocks
+else: gui_conf.path = target.path
+gui_conf.files = gui-config.json
+
+INSTALLS += target \
+            gui_conf
+
+!mac:unix: INSTALLS += desktop ssicon
 
 RESOURCES += icons.qrc
 
-RC_FILE = ss-qt5.rc
+win32: RC_FILE = ss-qt5.rc