Merge branch 'termitoz-futurator-redesign' int push origin futurator-…

…redesignto futurator-redesign
IJHack · Jan 19, 2016 · d0c8016 · d0c8016
2 parents 563fb38 + 7b98e56
commit d0c8016
Show file tree

Hide file tree

Showing 29 changed files with 1,360 additions and 354 deletions.
diff --git a/artwork/new blue/add.png b/artwork/new blue/add.png
diff --git a/artwork/new blue/cancel.png b/artwork/new blue/cancel.png
diff --git a/artwork/new blue/delete.png b/artwork/new blue/delete.png
diff --git a/artwork/new blue/down-arrow.png b/artwork/new blue/down-arrow.png
diff --git a/artwork/new blue/edit.png b/artwork/new blue/edit.png
diff --git a/artwork/new blue/help.png b/artwork/new blue/help.png
diff --git a/artwork/new blue/info.png b/artwork/new blue/info.png
diff --git a/artwork/new blue/key.png b/artwork/new blue/key.png
diff --git a/artwork/new blue/left-arrow.png b/artwork/new blue/left-arrow.png
diff --git a/artwork/new blue/ok.png b/artwork/new blue/ok.png
diff --git a/artwork/new blue/right-arrow.png b/artwork/new blue/right-arrow.png
diff --git a/artwork/new blue/search.png b/artwork/new blue/search.png
diff --git a/artwork/new blue/search_25_1.png b/artwork/new blue/search_25_1.png
diff --git a/artwork/new blue/search_25_2.png b/artwork/new blue/search_25_2.png
diff --git a/artwork/new blue/settings.png b/artwork/new blue/settings.png
diff --git a/artwork/new blue/up-arrow.png b/artwork/new blue/up-arrow.png
diff --git a/artwork/new blue/user.png b/artwork/new blue/user.png
diff --git a/artwork/progress.gif b/artwork/progress.gif
diff --git a/configdialog.ui b/configdialog.ui
diff --git a/keygendialog.cpp b/keygendialog.cpp
@@ -2,7 +2,7 @@
 #include <QDebug>
 #include <QMessageBox>
 #include "ui_keygendialog.h"
-#include "qprogressindicator.h"
+#include <QtGui>
 
 KeygenDialog::KeygenDialog(ConfigDialog *parent)
     : QDialog(parent), ui(new Ui::KeygenDialog) {
@@ -98,11 +98,6 @@ void KeygenDialog::done(int r) {
     ui->buttonBox->setEnabled(false);
     ui->checkBox->setEnabled(false);
     ui->plainTextEdit->setEnabled(false);
-
-    QProgressIndicator *pi = new QProgressIndicator();
-    pi->startAnimation();
-    pi->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
     ui->frame->hide();
     ui->label->setText(
         QString("This operation can take some minutes.<br />") +
@@ -112,7 +107,21 @@ void KeygenDialog::done(int r) {
         "disks) during the prime generation; this gives the random number "
         "generator a better chance to gain enough entropy.");
 
-    this->layout()->addWidget(pi);
+
+    QLabel* label = new QLabel();
+
+    label-> setWindowFlags(Qt::FramelessWindowHint);
+    label->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    //label->setGeometry(QRect(100, 100, 200, 200));
+    label->setMask((new QPixmap(":/artwork/progress.gif"))->mask());
+
+    this->layout()->addWidget(label);
+
+    QMovie *movie = new QMovie(":/artwork/progress.gif");
+    label->setMovie(movie);
+    movie->start();
+
+    label->show();
 
     this->show();
     dialog->genKey(ui->plainTextEdit->toPlainText(), this);

diff --git a/keygendialog.ui b/keygendialog.ui
@@ -94,13 +94,88 @@
          </item>
          <item row="2" column="2" colspan="3">
           <widget class="QLineEdit" name="passphrase2">
+           <property name="palette">
+            <palette>
+             <active>
+              <colorrole role="Text">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>86</red>
+                 <green>148</green>
+                 <blue>242</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </active>
+             <inactive>
+              <colorrole role="Text">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>86</red>
+                 <green>148</green>
+                 <blue>242</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </inactive>
+             <disabled>
+              <colorrole role="Text">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>128</red>
+                 <green>128</green>
+                 <blue>128</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </disabled>
+            </palette>
+           </property>
            <property name="echoMode">
             <enum>QLineEdit::Password</enum>
            </property>
           </widget>
          </item>
          <item row="0" column="1" colspan="2">
-          <widget class="QLineEdit" name="email"/>
+          <widget class="QLineEdit" name="email">
+           <property name="palette">
+            <palette>
+             <active>
+              <colorrole role="Text">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>86</red>
+                 <green>148</green>
+                 <blue>242</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </active>
+             <inactive>
+              <colorrole role="Text">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>86</red>
+                 <green>148</green>
+                 <blue>242</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </inactive>
+             <disabled>
+              <colorrole role="Text">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>128</red>
+                 <green>128</green>
+                 <blue>128</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </disabled>
+            </palette>
+           </property>
+          </widget>
          </item>
          <item row="0" column="3">
           <widget class="QLabel" name="labelName">
@@ -111,13 +186,88 @@
          </item>
          <item row="1" column="2" colspan="3">
           <widget class="QLineEdit" name="passphrase1">
+           <property name="palette">
+            <palette>
+             <active>
+              <colorrole role="Text">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>86</red>
+                 <green>148</green>
+                 <blue>242</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </active>
+             <inactive>
+              <colorrole role="Text">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>86</red>
+                 <green>148</green>
+                 <blue>242</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </inactive>
+             <disabled>
+              <colorrole role="Text">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>128</red>
+                 <green>128</green>
+                 <blue>128</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </disabled>
+            </palette>
+           </property>
            <property name="echoMode">
             <enum>QLineEdit::Password</enum>
            </property>
           </widget>
          </item>
          <item row="0" column="4">
-          <widget class="QLineEdit" name="name"/>
+          <widget class="QLineEdit" name="name">
+           <property name="palette">
+            <palette>
+             <active>
+              <colorrole role="Text">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>86</red>
+                 <green>148</green>
+                 <blue>242</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </active>
+             <inactive>
+              <colorrole role="Text">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>86</red>
+                 <green>148</green>
+                 <blue>242</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </inactive>
+             <disabled>
+              <colorrole role="Text">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>128</red>
+                 <green>128</green>
+                 <blue>128</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </disabled>
+            </palette>
+           </property>
+          </widget>
          </item>
         </layout>
        </widget>