Change branding

woodenshark · Jun 18, 2014 · d8e330b · d8e330b
1 parent fdc572a
commit d8e330b
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 38 deletions.
diff --git a/Software/res/translations/ru_RU.qm b/Software/res/translations/ru_RU.qm
diff --git a/Software/res/translations/ru_RU.ts b/Software/res/translations/ru_RU.ts
@@ -709,36 +709,36 @@ You still will be able to place capturing zones manually.</source>
     </message>
     <message>
         <location filename="../../src/SettingsWindow.cpp" line="303"/>
-        <location filename="../../src/SettingsWindow.cpp" line="1426"/>
+        <location filename="../../src/SettingsWindow.cpp" line="1431"/>
         <source>System default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="372"/>
+        <location filename="../../src/SettingsWindow.cpp" line="371"/>
         <source>FPS: %1</source>
         <translation>Кадр/c: %1</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="709"/>
-        <location filename="../../src/SettingsWindow.cpp" line="740"/>
+        <location filename="../../src/SettingsWindow.cpp" line="708"/>
+        <location filename="../../src/SettingsWindow.cpp" line="739"/>
         <source>Turn lights OFF</source>
         <translation>Выключить подсветку</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="1698"/>
-        <source>&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:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;software &lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;%1&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; (revision &lt;/span&gt;&lt;a href=&quot;http://code.google.com/p/lightpack/source/detail?r=%2&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;%2 &lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;), firmware &lt;b&gt;%3&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location filename="../../src/SettingsWindow.cpp" line="1703"/>
+        <source>&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:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;software &lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;%1&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; (revision &lt;/span&gt;&lt;a href=&quot;https://github.com/woodenshark/Lightpack/commit/%2&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;%2 &lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;), firmware &lt;b&gt;%3&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&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:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Софт версии &lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;%1&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; (ревизия &lt;/span&gt;&lt;a href=&quot;http://code.google.com/p/lightpack/source/detail?r=%2&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;%2 &lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;), прошивка &lt;b&gt;%3&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Софт версии &lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;%1&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; (ревизия &lt;/span&gt;&lt;a href=&quot;https://github.com/woodenshark/Lightpack/commit/%2&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;%2 &lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;), прошивка &lt;b&gt;%3&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Device locked via Plugin</source>
         <translation type="obsolete">Устройство находится под управлением плагина</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="732"/>
+        <location filename="../../src/SettingsWindow.cpp" line="731"/>
         <source>Turn lights ON</source>
         <translation>Включить подсветку</translation>
     </message>
@@ -747,19 +747,19 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Приложение уже запущено</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="370"/>
-        <location filename="../../src/SettingsWindow.cpp" line="1302"/>
+        <location filename="../../src/SettingsWindow.cpp" line="369"/>
+        <location filename="../../src/SettingsWindow.cpp" line="1307"/>
         <source>Profile: %1</source>
         <translation>Профиль: %1</translation>
     </message>
     <message>
         <location filename="../../src/SettingsWindow.cpp" line="295"/>
-        <location filename="../../src/SettingsWindow.cpp" line="1390"/>
+        <location filename="../../src/SettingsWindow.cpp" line="1395"/>
         <source>Prismatik: %1</source>
         <translation type="unfinished">Призматик: %1</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="371"/>
+        <location filename="../../src/SettingsWindow.cpp" line="370"/>
         <source>Device: %1</source>
         <translation>Устройство: %1</translation>
     </message>
@@ -813,7 +813,7 @@ p, li { white-space: pre-wrap; }
         <translation>Лайтпак</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="993"/>
+        <location filename="../../src/SettingsWindow.cpp" line="998"/>
         <source>update firmware</source>
         <translation>обновить прошивку</translation>
     </message>
@@ -826,7 +826,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Нажмите на это сообщение чтобы перейти на страницу скачивания прошивок</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="1023"/>
+        <location filename="../../src/SettingsWindow.cpp" line="1028"/>
         <source>FPS: </source>
         <translation>Кадр/с: </translation>
     </message>
@@ -835,7 +835,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Устройство:</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="1323"/>
+        <location filename="../../src/SettingsWindow.cpp" line="1328"/>
         <source>New profile</source>
         <translation>Новый профиль</translation>
     </message>

diff --git a/Software/res/translations/uk_UA.qm b/Software/res/translations/uk_UA.qm
diff --git a/Software/res/translations/uk_UA.ts b/Software/res/translations/uk_UA.ts
@@ -710,13 +710,13 @@ You still will be able to place capturing zones manually.</source>
     </message>
     <message>
         <location filename="../../src/SettingsWindow.cpp" line="295"/>
-        <location filename="../../src/SettingsWindow.cpp" line="1390"/>
+        <location filename="../../src/SettingsWindow.cpp" line="1395"/>
         <source>Prismatik: %1</source>
         <translation>Prismatik: %1</translation>
     </message>
     <message>
         <location filename="../../src/SettingsWindow.cpp" line="303"/>
-        <location filename="../../src/SettingsWindow.cpp" line="1426"/>
+        <location filename="../../src/SettingsWindow.cpp" line="1431"/>
         <source>System default</source>
         <translation>Типова для системи</translation>
     </message>
@@ -725,35 +725,35 @@ You still will be able to place capturing zones manually.</source>
         <translation type="obsolete">Вкладка розробника</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="370"/>
-        <location filename="../../src/SettingsWindow.cpp" line="1302"/>
+        <location filename="../../src/SettingsWindow.cpp" line="369"/>
+        <location filename="../../src/SettingsWindow.cpp" line="1307"/>
         <source>Profile: %1</source>
         <translation>Профіль: %1</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="371"/>
+        <location filename="../../src/SettingsWindow.cpp" line="370"/>
         <source>Device: %1</source>
         <translation>Пристрій: %1</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="372"/>
+        <location filename="../../src/SettingsWindow.cpp" line="371"/>
         <source>FPS: %1</source>
         <translation>FPS: %1</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="709"/>
-        <location filename="../../src/SettingsWindow.cpp" line="740"/>
+        <location filename="../../src/SettingsWindow.cpp" line="708"/>
+        <location filename="../../src/SettingsWindow.cpp" line="739"/>
         <source>Turn lights OFF</source>
         <translation>Вимкнути лампи</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="1698"/>
-        <source>&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:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;software &lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;%1&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; (revision &lt;/span&gt;&lt;a href=&quot;http://code.google.com/p/lightpack/source/detail?r=%2&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;%2 &lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;), firmware &lt;b&gt;%3&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location filename="../../src/SettingsWindow.cpp" line="1703"/>
+        <source>&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:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;software &lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;%1&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; (revision &lt;/span&gt;&lt;a href=&quot;https://github.com/woodenshark/Lightpack/commit/%2&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;%2 &lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;), firmware &lt;b&gt;%3&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&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:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;програмне забезпечення &lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;%1&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; (ревізія &lt;/span&gt;&lt;a href=&quot;http://code.google.com/p/lightpack/source/detail?r=%2&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;%2 &lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;), мікропрограма &lt;b&gt;%3&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;програмне забезпечення &lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;%1&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; (ревізія &lt;/span&gt;&lt;a href=&quot;https://github.com/woodenshark/Lightpack/commit/%2&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;%2 &lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;), мікропрограма &lt;b&gt;%3&lt;/b&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Device locked via API</source>
@@ -764,7 +764,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Пристрій заблоковано через додаток</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="732"/>
+        <location filename="../../src/SettingsWindow.cpp" line="731"/>
         <source>Turn lights ON</source>
         <translation>Увімкнути лампи</translation>
     </message>
@@ -777,7 +777,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Програма вже завантажена</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="993"/>
+        <location filename="../../src/SettingsWindow.cpp" line="998"/>
         <source>update firmware</source>
         <translation>оновити мікропрограму</translation>
     </message>
@@ -790,12 +790,12 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Для відкриття сторінки завантаження lightpack натисніть це повідомлення.</translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="1023"/>
+        <location filename="../../src/SettingsWindow.cpp" line="1028"/>
         <source>FPS: </source>
         <translation>FPS: </translation>
     </message>
     <message>
-        <location filename="../../src/SettingsWindow.cpp" line="1323"/>
+        <location filename="../../src/SettingsWindow.cpp" line="1328"/>
         <source>New profile</source>
         <translation>Новий профіль</translation>
     </message>

diff --git a/Software/src/LightpackApplication.cpp b/Software/src/LightpackApplication.cpp
@@ -57,7 +57,7 @@ LightpackApplication::LightpackApplication(int &argc, char **argv)
 void LightpackApplication::initializeAll(const QString & appDirPath)
 {
     setApplicationName("Prismatik");
-    setOrganizationName("Pixelkit LLC");
+    setOrganizationName("Woodenshark LLC");
     setApplicationVersion(VERSION_STR);
     setQuitOnLastWindowClosed(false);
 

diff --git a/Software/src/SettingsWindow.cpp b/Software/src/SettingsWindow.cpp
@@ -1522,7 +1522,7 @@ void SettingsWindow::createTrayIcon()
     connect(m_trayIcon, SIGNAL(profileSwitched(QString)), this, SLOT(profileTraySwitch(QString)));
 
     m_trayIcon->init();
-    connect(this, SIGNAL(backlightStatusChanged(int)), this, SLOT(updateTrayAndActionStates()));
+    connect(this, SIGNAL(backlightStatusChanged(Backlight::Status)), this, SLOT(updateTrayAndActionStates()));
 }
 
 void SettingsWindow::updateUiFromSettings()
@@ -1700,7 +1700,7 @@ void SettingsWindow::versionsUpdate()
     DEBUG_LOW_LEVEL << Q_FUNC_INFO;
 
     // use template to construct version string
-    QString versionsTemplate = tr("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"> <html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\"> p, li { white-space: pre-wrap; } </style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\"> <p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">software <span style=\" font-size:8pt; font-weight:600;\">%1</span><span style=\" font-size:8pt;\"> (revision </span><a href=\"http://code.google.com/p/lightpack/source/detail?r=%2\"><span style=\" font-size:8pt; text-decoration: underline; color:#0000ff;\">%2 </span></a><span style=\" font-size:8pt;\">), firmware <b>%3</b></span></p></body></html>");
+    QString versionsTemplate = tr("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"> <html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\"> p, li { white-space: pre-wrap; } </style></head><body style=\" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;\"> <p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">software <span style=\" font-size:8pt; font-weight:600;\">%1</span><span style=\" font-size:8pt;\"> (revision </span><a href=\"https://github.com/woodenshark/Lightpack/commit/%2\"><span style=\" font-size:8pt; text-decoration: underline; color:#0000ff;\">%2 </span></a><span style=\" font-size:8pt;\">), firmware <b>%3</b></span></p></body></html>");
 
 #ifdef GIT_REVISION
     versionsTemplate = versionsTemplate.arg(

diff --git a/Software/src/SettingsWindow.ui b/Software/src/SettingsWindow.ui
@@ -2548,7 +2548,7 @@
            </size>
           </property>
           <property name="text">
-           <string notr="true">&lt;a href=&quot;http://lightpack.googlecode.com/&quot;&gt;lightpack.googlecode.com&lt;/a&gt;</string>
+           <string notr="true">&lt;a href=&quot;http://lightpack.tv/&quot;&gt;lightpack.tv&lt;/a&gt;</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>

diff --git a/Software/src/src.pro b/Software/src/src.pro
@@ -2,7 +2,7 @@
 # src.pro
 #
 # Copyright (c) 2010,2011 Mike Shatohin, mikeshatohin [at] gmail.com
-# http://lightpack.googlecode.com
+# http://lightpack.tv https://github.com/woodenshark/Lightpack
 # Project created by QtCreator 2010-04-28T19:08:13
 # -------------------------------------------------