-Add ru localization

-Add help link
-Fix checksystem

.gitignore

@@ -2,3 +2,4 @@
 *.pro.user
 /build_64_release/
 /TrackYourTime.app/
+/build_64_debug/

TrackYourTime/ui/app_settingswindow.cpp

@@ -10,7 +10,7 @@ App_SettingsWindow::App_SettingsWindow(cDataManager *DataManager) :
     ui->setupUi(this);    
     m_DataManager = DataManager;
 
-    ui->plainTextEditScript->setPlaceholderText("Place title parser code here. Look predefined scripts for example.");
+    ui->plainTextEditScript->setPlaceholderText(tr("Place title parser code here. Look predefined scripts for example."));
     connect(ui->pushButtonApply,SIGNAL(released()),this,SLOT(onApply()));
     connect(ui->pushButtonStartDebug,SIGNAL(released()),this,SLOT(onSetDebug()));
 }

TrackYourTime/ui/app_settingswindow.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Application settings</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <property name="sizePolicy">

TrackYourTime/ui/ctrayicon.cpp

@@ -18,6 +18,8 @@
 
 #include "ctrayicon.h"
 #include <QApplication>
+#include <QDesktopServices>
+#include <QUrl>
 
 
 
@@ -59,6 +61,7 @@ cTrayIcon::cTrayIcon(cDataManager *DataManager):QSystemTrayIcon()
 #endif
     m_Menu.addSeparator();
     m_Menu.addAction(tr("About..."))->setData("ABOUT");
+    m_Menu.addAction(tr("Help..."))->setData("HELP");
     m_Menu.addSeparator();
     m_Menu.addAction(tr("Exit"))->setData("EXIT");
 
@@ -141,6 +144,11 @@ void cTrayIcon::onMenuSelection(QAction *menuAction)
         return;
     }
 
+    if (id=="HELP"){
+        QDesktopServices::openUrl(QUrl(tr("https://github.com/Allexin/TrackYourTime/wiki/User-Manual")));
+        return;
+    }
+
     if (id=="PROFILES"){
         m_ProfilesMenu.popup(QCursor::pos());
         return;

TrackYourTime/ui/notification_dummy.cpp

@@ -7,6 +7,7 @@ notification_dummy::notification_dummy(QWidget *parent) :
 {
     ui->setupUi(this);
     connect(ui->pushButtonApply,SIGNAL(released()),this,SLOT(onButtonApply()));
+    connect(ui->pushButtonClose,SIGNAL(released()),this,SLOT(hide()));
 }
 
 notification_dummy::~notification_dummy()
@@ -17,7 +18,6 @@ notification_dummy::~notification_dummy()
 void notification_dummy::showWithMessage(const QString &format, bool compactMode)
 {
     ui->labelMessage->setText(format);
-    ui->pushButton->setVisible(!compactMode);
     ui->comboBoxCategories->setVisible(!compactMode);
     ui->labelCategory->setVisible(!compactMode);
 

TrackYourTime/ui/notification_dummy.ui

@@ -92,16 +92,16 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="pushButton">
+       <widget class="QPushButton" name="pushButtonApply">
         <property name="text">
-         <string>Set for all profiles</string>
+         <string>Apply</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="pushButtonApply">
+       <widget class="QPushButton" name="pushButtonClose">
         <property name="text">
-         <string>Set for current profile</string>
+         <string>Close</string>
         </property>
        </widget>
       </item>

change.log

@@ -8,4 +8,6 @@
 -Improve HDPI display support
 -Add periods in statistic window
 -Add percents on categories statistic
--Show Applications on tray icon click
+-Show Applications on tray icon click
+-Add built-in notification window
+-Add modern windows apps support

checksystem/.gitignore

@@ -1 +1,3 @@
 /build-checksystem-Desktop_Qt_5_5_Bundled_GCC_64bit-Release/
+/build-checksystem-Desktop_Qt_5_5_1_GCC_64bit-Debug/
+/build-checksystem-Desktop_Qt_5_5_1_GCC_64bit-Release/

checksystem/checksystem/.gitignore

@@ -0,0 +1 @@
+*.pro.user

checksystem/checksystem/main.cpp

@@ -19,11 +19,14 @@
 #include <QCoreApplication>
 #include <QDir>
 #include <QTextStream>
+#include <QStringList>
 #include <fcntl.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
+#include <QVector>
+
 
 
 enum eActiveWindowState{
@@ -42,8 +45,6 @@ eActiveWindowState checkActiveWindow(){
     Atom active 	= XInternAtom(display, "_NET_ACTIVE_WINDOW", False);
 
     XTextProperty text;
-    char **name = NULL;
-    int param;
 
     Atom type_ret;
     int format_ret;
@@ -88,23 +89,23 @@ eInputState checkUdev(){
 
     path = "/dev/input/by-id";
     keyboards = QDir(path).entryList(QStringList() << "*keyboard*");
-    for (int i = 0; i<keyboards; i++)
-        keyboards_fd.push_back(open((path+keyboards[i]).toUtf8().constData(), 0));
+    for (int i = 0; i<keyboards.size(); i++)
+        keyboards_fd.push_back(open((path+"/"+keyboards[i]).toUtf8().constData(), 0));
 
     path = "/dev/input/by-id";
     keyboards = QDir(path).entryList(QStringList() << "*kbd*");
-    for (int i = 0; i<keyboards; i++)
-        keyboards_fd.push_back(open((path+keyboards[i]).toUtf8().constData(), 0));
+    for (int i = 0; i<keyboards.size(); i++)
+        keyboards_fd.push_back(open((path+"/"+keyboards[i]).toUtf8().constData(), 0));
 
     path = "/dev/input/by-path";
     keyboards = QDir(path).entryList(QStringList() << "*keyboard*");
-    for (int i = 0; i<keyboards; i++)
-        keyboards_fd.push_back(open((path+keyboards[i]).toUtf8().constData(), 0));
+    for (int i = 0; i<keyboards.size(); i++)
+        keyboards_fd.push_back(open((path+"/"+keyboards[i]).toUtf8().constData(), 0));
 
     path = "/dev/input/by-path";
     keyboards = QDir(path).entryList(QStringList() << "*kbd*");
-    for (int i = 0; i<keyboards; i++)
-        keyboards_fd.push_back(open((path+keyboards[i]).toUtf8().constData(), 0));
+    for (int i = 0; i<keyboards.size(); i++)
+        keyboards_fd.push_back(open((path+"/"+keyboards[i]).toUtf8().constData(), 0));
 
     if (keyboards_fd.size()==0)
         return UDEV_KEYBOARD_NOT_FOUND;