better icons, ResetParameters

diff --git a/appl/refind/aboutdialog.ui b/appl/refind/aboutdialog.ui
index fd6f14694442c358c31656ee68474b5b5db3ec4f..d9a70ea7be94f18dbfc6c32e954d65fbaa12185d 100644 (file)
--- a/appl/refind/aboutdialog.ui
+++ b/appl/refind/aboutdialog.ui
@@ -33,7 +33,8 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">ReFind</span> for searching files in a directory tree</p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This is a program of the project "<span style=" font-weight:600;">Re</span>al <span style=" font-weight:600;">Pub</span>lic <span style=" font-weight:600;">Lib</span>rary".</p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Sources are public domain and available under https://github.com/republib</p>
-&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;Implemented in QT (C++) 5.x&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&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;Implemented in QT (C++) 5.x&lt;/p&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;Icons:  Mark James, &lt;a href=&quot;http://famfamfam.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://famfamfam.com&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
   </widget>
   <widget class="QPushButton" name="pushButtonOK">

diff --git a/appl/refind/icons/action_go.png b/appl/refind/icons/action_go.png
new file mode 100755 (executable)
index 0000000..ef5bfc3
Binary files /dev/null and b/appl/refind/icons/action_go.png differ

diff --git a/appl/refind/icons/action_paste.png b/appl/refind/icons/action_paste.png
new file mode 100755 (executable)
index 0000000..60f7841
Binary files /dev/null and b/appl/refind/icons/action_paste.png differ

diff --git a/appl/refind/icons/folder.png b/appl/refind/icons/folder.png
new file mode 100644 (file)
index 0000000..784e8fa
Binary files /dev/null and b/appl/refind/icons/folder.png differ

diff --git a/appl/refind/icons/folder_find.png b/appl/refind/icons/folder_find.png
new file mode 100644 (file)
index 0000000..c64e2ee
Binary files /dev/null and b/appl/refind/icons/folder_find.png differ

diff --git a/appl/refind/icons/folder_go.png b/appl/refind/icons/folder_go.png
new file mode 100644 (file)
index 0000000..34a736f
Binary files /dev/null and b/appl/refind/icons/folder_go.png differ

diff --git a/appl/refind/icons/folder_magnify.png b/appl/refind/icons/folder_magnify.png
new file mode 100644 (file)
index 0000000..0a3e798
Binary files /dev/null and b/appl/refind/icons/folder_magnify.png differ

diff --git a/appl/refind/icons/table.png b/appl/refind/icons/table.png
new file mode 100755 (executable)
index 0000000..6f794bc
Binary files /dev/null and b/appl/refind/icons/table.png differ

diff --git a/appl/refind/icons/tables.png b/appl/refind/icons/tables.png
new file mode 100755 (executable)
index 0000000..e88ceb5
Binary files /dev/null and b/appl/refind/icons/tables.png differ

diff --git a/appl/refind/icons/wand.png b/appl/refind/icons/wand.png
new file mode 100644 (file)
index 0000000..44ccbf8
Binary files /dev/null and b/appl/refind/icons/wand.png differ

diff --git a/appl/refind/mainwindow.cpp b/appl/refind/mainwindow.cpp
index 7036ff40e1a07e817a08dad09f7ca3ad5085c0f6..fa01bc0fd349f06af579967b8a8e927bbc763b23 100644 (file)
--- a/appl/refind/mainwindow.cpp
+++ b/appl/refind/mainwindow.cpp
@@ -54,8 +54,10 @@ MainWindow::MainWindow(const QString& startDir, QWidget *parent) :
       SLOT(absPathToClipboard()));
    connect(ui->actionGetFullName, SIGNAL(triggered()), this,
       SLOT(fullNameToClipboard()));
-   connect(ui->actionGetBaseDirectory, SIGNAL(triggered()), this,
-      SLOT(baseDirToClipboard()));
+   connect(ui->actionGetFullName, SIGNAL(triggered()), this,
+      SLOT(fullNameToClipboard()));
+   connect(ui->actionReset, SIGNAL(triggered()), this,
+      SLOT(resetParameters()));
    connect(ui->tableWidget, SIGNAL(cellClicked(int,int)), this, SLOT(cellEntered(int, int)));
    m_horizontalHeader = ui->tableWidget->horizontalHeader();
    connect(m_horizontalHeader, SIGNAL(sectionClicked ( int ) ),
@@ -290,11 +292,33 @@ void MainWindow::prepareTextFind(){
    }
 }
 
+void MainWindow::resetParameters(){
+   ui->comboBoxFilePatterns->setCurrentText("");
+   ui->comboBoxMaxDepth->setCurrentText("");
+   ui->comboBoxMaxSize->setCurrentText("");
+   ui->comboBoxMinDepth->setCurrentText("");
+   ui->comboBoxMinSize->setCurrentText("");
+   ui->comboBoxOlder->setCurrentText("");
+   ui->comboBoxYounger->setCurrentText("");
+   ui->comboBoxTextPattern->setCurrentText("");
+   ui->checkBoxBinaryFiles->setChecked(false);
+   ui->checkBoxDirs->setChecked(true);
+   ui->checkBoxFiles->setChecked(true);
+   ui->checkBoxHidden->setChecked(false);
+   ui->checkBoxLinks->setChecked(true);
+   ui->checkBoxReadable->setChecked(true);
+   ui->checkBoxRegExpr->setChecked(false);
+   ui->checkBoxTextIgnoreCase->setChecked(false);
+   ui->checkBoxWritable->setChecked(true);
+   ui->checkBoxExecutable->setChecked(true);
+}
+
 /**
  * Handles the "search" button.
  */
 void MainWindow::search(){
    m_errors = 0;
+   QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
    QString path = ui->comboBoxDirectory->currentText();
    QFileInfo dir(path);
    if (!dir.exists())
@@ -341,6 +365,7 @@ void MainWindow::search(){
          setStatusMessage(false, msg);
       }
    }
+   QApplication::restoreOverrideCursor();
 }
 /**
  * Handles the push of the button "select directory".

diff --git a/appl/refind/mainwindow.hpp b/appl/refind/mainwindow.hpp
index 39eef4085788b92fb46de5da9a37da367746ea40..0e915fee460e3f7eadef9eab7a9a53fb54050789 100644 (file)
--- a/appl/refind/mainwindow.hpp
+++ b/appl/refind/mainwindow.hpp
@@ -43,6 +43,7 @@ private slots:
    void baseDirToClipboard();
    void fullNameToClipboard();
    void headerClicked(int col);
+   void resetParameters();
    void search();
    void up();
    void selectDirectory();

diff --git a/appl/refind/mainwindow.ui b/appl/refind/mainwindow.ui
index e24827b8122db0d6096139fd2bd9cce0737c32e3..86f22c47c5445d9339ced3f16a98caf4b467c9b4 100644 (file)
--- a/appl/refind/mainwindow.ui
+++ b/appl/refind/mainwindow.ui
@@ -292,8 +292,9 @@
                <string>&amp;Search</string>
               </property>
               <property name="icon">
-               <iconset resource="refind.qrc">
-                <normaloff>:/main/icons/action_go.gif</normaloff>:/main/icons/action_go.gif</iconset>
+               <iconset>
+                <normaloff>:/main/icons/action_go.gif</normaloff>
+                <normalon>:/main/icons/action_go.png</normalon>:/main/icons/action_go.gif</iconset>
               </property>
               <property name="shortcut">
                <string>Ctrl+F</string>
@@ -324,7 +325,7 @@
                 </property>
                 <property name="icon">
                  <iconset resource="refind.qrc">
-                  <normaloff>:/main/icons/arrow_turn_left.png</normaloff>:/main/icons/arrow_turn_left.png</iconset>
+                  <normaloff>:/main/icons/folder_go.png</normaloff>:/main/icons/folder_go.png</iconset>
                 </property>
                </widget>
               </item>
@@ -350,7 +351,7 @@
                 </property>
                 <property name="icon">
                  <iconset resource="refind.qrc">
-                  <normaloff>:/main/icons/sitemap_color.png</normaloff>:/main/icons/sitemap_color.png</iconset>
+                  <normaloff>:/main/icons/folder_find.png</normaloff>:/main/icons/folder_find.png</iconset>
                 </property>
                </widget>
               </item>
@@ -604,8 +605,9 @@
               <string>&amp;Search</string>
              </property>
              <property name="icon">
-              <iconset resource="refind.qrc">
-               <normaloff>:/main/icons/action_go.gif</normaloff>:/main/icons/action_go.gif</iconset>
+              <iconset>
+               <normaloff>:/main/icons/action_go.gif</normaloff>
+               <normalon>:/main/icons/action_go.png</normalon>:/main/icons/action_go.gif</iconset>
              </property>
             </widget>
            </item>
@@ -703,6 +705,8 @@
     <addaction name="actionGetFullName"/>
     <addaction name="actionGetBaseDirectory"/>
     <addaction name="separator"/>
+    <addaction name="separator"/>
+    <addaction name="actionReset"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menu_Edit"/>
@@ -719,7 +723,7 @@
    <addaction name="actionSearch"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
-  <widget class="QToolBar" name="toolBar">
+  <widget class="QToolBar" name="toolBarNavigate">
    <property name="windowTitle">
     <string>toolBar</string>
    </property>
@@ -731,11 +735,33 @@
    </attribute>
    <addaction name="actionUp"/>
    <addaction name="actionSelectDirectory"/>
-   <addaction name="separator"/>
+  </widget>
+  <widget class="QToolBar" name="toolBarEdit">
+   <property name="windowTitle">
+    <string>toolBar_2</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
    <addaction name="actionGetAbsPath"/>
    <addaction name="actionGetFullName"/>
    <addaction name="actionGetBaseDirectory"/>
    <addaction name="separator"/>
+   <addaction name="actionReset"/>
+  </widget>
+  <widget class="QToolBar" name="toolBarExit">
+   <property name="windowTitle">
+    <string>toolBar_2</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
    <addaction name="actionExit"/>
   </widget>
   <action name="actionExit">
@@ -756,7 +782,7 @@
   <action name="actionSearch">
    <property name="icon">
     <iconset resource="refind.qrc">
-     <normaloff>:/main/icons/action_go.gif</normaloff>:/main/icons/action_go.gif</iconset>
+     <normaloff>:/main/icons/action_go.png</normaloff>:/main/icons/action_go.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Search</string>
@@ -787,7 +813,7 @@
   <action name="actionUp">
    <property name="icon">
     <iconset resource="refind.qrc">
-     <normaloff>:/main/icons/arrow_turn_left.png</normaloff>:/main/icons/arrow_turn_left.png</iconset>
+     <normaloff>:/main/icons/folder_go.png</normaloff>:/main/icons/folder_go.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Up</string>
@@ -802,7 +828,7 @@
   <action name="actionSelectDirectory">
    <property name="icon">
     <iconset resource="refind.qrc">
-     <normaloff>:/main/icons/sitemap_color.png</normaloff>:/main/icons/sitemap_color.png</iconset>
+     <normaloff>:/main/icons/folder_find.png</normaloff>:/main/icons/folder_find.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Select directory</string>
@@ -817,7 +843,7 @@
   <action name="actionGetAbsPath">
    <property name="icon">
     <iconset resource="refind.qrc">
-     <normaloff>:/main/icons/tables.gif</normaloff>:/main/icons/tables.gif</iconset>
+     <normaloff>:/main/icons/folder.png</normaloff>:/main/icons/folder.png</iconset>
    </property>
    <property name="text">
     <string>Get absolute &amp;path</string>
@@ -831,9 +857,9 @@
   </action>
   <action name="actionGetFullName">
    <property name="icon">
-    <iconset>
-     <normaloff>icons/table.gif</normaloff>
-     <normalon>:/main/icons/table.gif</normalon>icons/table.gif</iconset>
+    <iconset resource="refind.qrc">
+     <normaloff>:/main/icons/table.png</normaloff>
+     <normalon>:/main/icons/table.gif</normalon>:/main/icons/table.png</iconset>
    </property>
    <property name="text">
     <string>Get &amp;full name</string>
@@ -845,7 +871,7 @@
   <action name="actionGetBaseDirectory">
    <property name="icon">
     <iconset resource="refind.qrc">
-     <normaloff>:/main/icons/action_paste.gif</normaloff>:/main/icons/action_paste.gif</iconset>
+     <normaloff>:/main/icons/action_paste.png</normaloff>:/main/icons/action_paste.png</iconset>
    </property>
    <property name="text">
     <string>Get &amp;base directory</string>
@@ -857,6 +883,21 @@
     <string>Ctrl+B</string>
    </property>
   </action>
+  <action name="actionReset">
+   <property name="icon">
+    <iconset resource="refind.qrc">
+     <normaloff>:/main/icons/wand.png</normaloff>:/main/icons/wand.png</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Reset search parameters</string>
+   </property>
+   <property name="toolTip">
+    <string>Sets the file filter properties to the default</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+R</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <tabstops>

diff --git a/appl/refind/refind.qrc b/appl/refind/refind.qrc
index cc602ab770790480af250b99fef8245b711a1b12..05e91c4cb69004e5aaf361e02251a8863794215d 100644 (file)
--- a/appl/refind/refind.qrc
+++ b/appl/refind/refind.qrc
@@ -10,5 +10,10 @@
         <file>icons/tables.png</file>
         <file>icons/action_go.png</file>
         <file>icons/action_paste.png</file>
+        <file>icons/folder_find.png</file>
+        <file>icons/folder_go.png</file>
+        <file>icons/folder_magnify.png</file>
+        <file>icons/folder.png</file>
+        <file>icons/wand.png</file>
     </qresource>
 </RCC>