New free flags, refactorings.

CMakeLists.txt

@@ -236,7 +236,6 @@ set(APP_MISC
   resources/text/CHANGELOG
   resources/text/COPYING_GNU_GPL
   resources/text/COPYING_GNU_GPL_HTML
-  resources/text/COPYING_FLAGS
 )
 
 # Wrap files, create moc files.

resources/text/COPYING_FLAGS

@@ -1,7 +0,0 @@
-Copyright (c) 2012 Go Squared Ltd. http://www.gosquared.com/
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/gui/dynamicshortcutswidget.h

@@ -24,7 +24,8 @@ class DynamicShortcutsWidget : public QWidget {
 
     // Populates this widget with shortcut widgets for given actions.
     // NOTE: This gets initial shortcut for each action from its properties, NOT from
-    // the application settings.
+    // the application settings, so shortcuts from settings need to be
+    // assigned to actions before calling this method.
     void populate(const QList<QAction*> actions);
 
   private:

src/gui/formabout.cpp

@@ -26,15 +26,6 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout)
   }
   file.close();
 
-  file.setFileName(APP_INFO_PATH + "/COPYING_FLAGS");
-  if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-    m_ui->m_txtLicenseFlags->setText(str.readAll());
-  }
-  else {
-    m_ui->m_txtLicenseFlags->setText(tr("License not found."));
-  }
-  file.close();
-
   file.setFileName(APP_INFO_PATH + "/CHANGELOG");
   if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
     m_ui->m_txtChangelog->setText(str.readAll());

src/gui/formabout.ui

@@ -170,7 +170,7 @@ p, li { white-space: pre-wrap; }
             <x>0</x>
             <y>0</y>
             <width>685</width>
-            <height>203</height>
+            <height>230</height>
            </rect>
           </property>
           <property name="autoFillBackground">
@@ -228,76 +228,6 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans Mono'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="textInteractionFlags">
-              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-         <widget class="QWidget" name="page_FLAGS">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>685</width>
-            <height>203</height>
-           </rect>
-          </property>
-          <attribute name="label">
-           <string>Go Squared License (applies to graphical flags)</string>
-          </attribute>
-          <attribute name="toolTip">
-           <string>Go Squared License (for flags in settings)</string>
-          </attribute>
-          <layout class="QVBoxLayout" name="verticalLayout_6">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QTextBrowser" name="m_txtLicenseFlags">
-             <property name="font">
-              <font>
-               <family>DejaVu Sans Mono</family>
-              </font>
-             </property>
-             <property name="styleSheet">
-              <string notr="true"/>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::NoFrame</enum>
-             </property>
-             <property name="horizontalScrollBarPolicy">
-              <enum>Qt::ScrollBarAlwaysOff</enum>
-             </property>
-             <property name="autoFormatting">
-              <set>QTextEdit::AutoNone</set>
-             </property>
-             <property name="undoRedoEnabled">
-              <bool>false</bool>
-             </property>
-             <property name="lineWrapMode">
-              <enum>QTextEdit::WidgetWidth</enum>
-             </property>
-             <property name="readOnly">
-              <bool>true</bool>
-             </property>
-             <property name="html">
-              <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans Mono'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="textInteractionFlags">

src/gui/formmain.cpp

@@ -11,13 +11,13 @@
 #include "qtsingleapplication/qtsingleapplication.h"
 
 
-FormMain *FormMain::m_this;
+FormMain *FormMain::s_instance;
 
 FormMain::FormMain(QWidget *parent) : QMainWindow(parent), m_ui(new Ui::FormMain) {
   m_ui->setupUi(this);
 
   // Initialize singleton.
-  m_this = this;
+  s_instance = this;
 
   // Establish connections.
   createConnections();
@@ -35,7 +35,7 @@ FormMain::~FormMain() {
 }
 
 FormMain *FormMain::getInstance() {
-  return m_this;
+  return s_instance;
 }
 
 QMenu *FormMain::getTrayMenu() {

src/gui/formmain.h

@@ -24,18 +24,29 @@ class FormMain : public QMainWindow {
     static FormMain *getInstance();
 
   protected:
+    // Creates all needed menus and sets them up.
     void prepareMenus();
-    void createConnections();
-    void closeEvent(QCloseEvent *event);
 
+    // Creates needed connections for this window.
+    void createConnections();
+
+    // Event handler reimplementations.
+    void closeEvent(QCloseEvent *event);
     bool event(QEvent *event);
 
     // Sets up proper icons for this widget.
+    // NOTE: All permanent widgets should implement this
+    // kind of method and catch ThemeFactoryEvent::type() in its event handler.
     void setupIcons();
 
   public slots:
+    // Processes incoming message from another RSS Guard instance.
     void processExecutionMessage(const QString &message);
+
+    // Quits the application.
     void quit();
+
+    // Displays window on top or switches its visibility.
     void display();
     void switchVisibility();
 
@@ -48,7 +59,7 @@ class FormMain : public QMainWindow {
     Ui::FormMain *m_ui;
     QMenu *m_trayMenu;
 
-    static FormMain *m_this;
+    static FormMain *s_instance;
 };
 
 #endif // FORMMAIN_H

src/gui/formsettings.cpp

@@ -54,6 +54,8 @@ void FormSettings::saveSettings() {
   saveShortcuts();
   saveInterface();
   saveLanguage();
+
+  Settings::getInstance()->checkSettings();
 }
 
 void FormSettings::loadLanguage() {

src/gui/shortcutbutton.cpp

@@ -40,16 +40,16 @@ ShortcutButton::~ShortcutButton() {
 }
 
 void ShortcutButton::keyPressEvent(QKeyEvent *event) {
-  int keyQt =  event->key();
+  int pressed_key =  event->key();
 
-  if (keyQt == -1) {
+  if (pressed_key == -1) {
     m_catcher->doneRecording();
   }
 
-  Qt::KeyboardModifiers newModifiers = event->modifiers() &
+  Qt::KeyboardModifiers new_modifiers = event->modifiers() &
                                        (Qt::SHIFT | Qt::CTRL | Qt::ALT | Qt::META);
 
-  if (m_catcher->m_isRecording == false && (keyQt == Qt::Key_Return || keyQt == Qt::Key_Space)) {
+  if (m_catcher->m_isRecording == false && (pressed_key == Qt::Key_Return || pressed_key == Qt::Key_Space)) {
     return;
   }
 
@@ -58,9 +58,9 @@ void ShortcutButton::keyPressEvent(QKeyEvent *event) {
   }
 
   event->accept();
-  m_catcher->m_modifierKeys = newModifiers;
+  m_catcher->m_modifierKeys = new_modifiers;
 
-  switch(keyQt) {
+  switch(pressed_key) {
     case Qt::Key_AltGr:
       return;
     case Qt::Key_Shift:
@@ -75,19 +75,19 @@ void ShortcutButton::keyPressEvent(QKeyEvent *event) {
     }
 
       // We now have a valid key press.
-      if (keyQt) {
+      if (pressed_key) {
-        if ((keyQt == Qt::Key_Backtab) && (m_catcher->m_modifierKeys & Qt::SHIFT)) {
+        if ((pressed_key == Qt::Key_Backtab) && (m_catcher->m_modifierKeys & Qt::SHIFT)) {
-          keyQt = Qt::Key_Tab | m_catcher->m_modifierKeys;
+          pressed_key = Qt::Key_Tab | m_catcher->m_modifierKeys;
         }
         else {
-          keyQt |= m_catcher->m_modifierKeys;
+          pressed_key |= m_catcher->m_modifierKeys;
         }
 
         if (m_catcher->m_numKey == 0) {
-          m_catcher->m_currentSequence = QKeySequence(keyQt);
+          m_catcher->m_currentSequence = QKeySequence(pressed_key);
         }
 
-        m_catcher->m_numKey++; // increment nuber of pressed keys
+        m_catcher->m_numKey++;
 
         if (m_catcher->m_numKey >= 4) {
           m_catcher->doneRecording();
@@ -111,11 +111,11 @@ void ShortcutButton::keyReleaseEvent(QKeyEvent *event) {
 
   event->accept();
 
-  Qt::KeyboardModifiers newModifiers = event->modifiers() &
+  Qt::KeyboardModifiers new_modifiers = event->modifiers() &
                                        (Qt::SHIFT | Qt::CTRL | Qt::ALT | Qt::META);
 
-  if ((newModifiers & m_catcher->m_modifierKeys) < m_catcher->m_modifierKeys) {
+  if ((new_modifiers & m_catcher->m_modifierKeys) < m_catcher->m_modifierKeys) {
-    m_catcher->m_modifierKeys = newModifiers;
+    m_catcher->m_modifierKeys = new_modifiers;
     m_catcher->controlModifierlessTimout();
     m_catcher->updateDisplayShortcut();
   }