reidos: main window

diff --git a/appl/reide/mainwindow.ui b/appl/reide/mainwindow.ui
index efd52e1335fa85c563e20f0ed836f9680173c3df..332e777474d1e296d42ed1b4fd410702a7257040 100644 (file)
--- a/appl/reide/mainwindow.ui
+++ b/appl/reide/mainwindow.ui
@@ -14,7 +14,189 @@
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralWidget">
-   <layout class="QVBoxLayout" name="verticalLayout"/>
+   <layout class="QHBoxLayout" name="horizontalLayout_3">
+    <item>
+     <widget class="QSplitter" name="splitter">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <widget class="QWidget" name="">
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QComboBox" name="comboBoxPath1">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="pushButtonUp">
+            <property name="maximumSize">
+             <size>
+              <width>25</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>^</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="comboBoxPattern">
+            <property name="maximumSize">
+             <size>
+              <width>150</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="pushButtonRoot">
+            <property name="maximumSize">
+             <size>
+              <width>25</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>/</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="QTableWidget" name="tableWidget">
+          <attribute name="horizontalHeaderStretchLastSection">
+           <bool>true</bool>
+          </attribute>
+          <attribute name="verticalHeaderVisible">
+           <bool>true</bool>
+          </attribute>
+          <column>
+           <property name="text">
+            <string>Modified</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Size</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Type</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Name</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="layoutWidget">
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QComboBox" name="comboBoxPath1_2">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="pushButtonUp_2">
+            <property name="maximumSize">
+             <size>
+              <width>25</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>^</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="comboBoxPattern_2">
+            <property name="maximumSize">
+             <size>
+              <width>150</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="pushButtonRoot_2">
+            <property name="maximumSize">
+             <size>
+              <width>25</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>/</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="QTableWidget" name="tableWidget_2">
+          <attribute name="horizontalHeaderStretchLastSection">
+           <bool>true</bool>
+          </attribute>
+          <attribute name="verticalHeaderVisible">
+           <bool>true</bool>
+          </attribute>
+          <column>
+           <property name="text">
+            <string>Modified</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Size</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Type</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Name</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </item>
+   </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">

diff --git a/appl/reide/reide.pro b/appl/reide/reide.pro
index 2c280340ff2bf35bb6f55292c1ce3bed185df2ea..7f65b9d5b61686d99d30a047d42c4ccd7e1c0868 100644 (file)
--- a/appl/reide/reide.pro
+++ b/appl/reide/reide.pro
@@ -25,6 +25,7 @@ SOURCES += \
        ../../base/ReFileUtils.cpp \
        ../../base/ReException.cpp \
        ../../base/ReDiff.cpp \
+       ../../os/ReFileSystem.cpp \
        projectselection.cpp \
        workspace.cpp \
        project.cpp \

diff --git a/appl/reidos/idosmain.ui b/appl/reidos/idosmain.ui
index 6054c6c20dd23e133c6b03af871fc6959d022154..f1937494f5ea1843131bd681cedc7e13ee6f701b 100644 (file)
--- a/appl/reidos/idosmain.ui
+++ b/appl/reidos/idosmain.ui
@@ -24,44 +24,81 @@
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="spacing">
+           <number>0</number>
+          </property>
           <item>
-           <widget class="QComboBox" name="comboBoxPathTop">
+           <widget class="QPushButton" name="pushButtonDevice">
+            <property name="maximumSize">
+             <size>
+              <width>25</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="comboBoxPath">
             <property name="editable">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QToolButton" name="toolButtonHistoryTop">
+           <widget class="QPushButton" name="pushButtonUp">
+            <property name="maximumSize">
+             <size>
+              <width>25</width>
+              <height>16777215</height>
+             </size>
+            </property>
             <property name="text">
-             <string>...</string>
+             <string>^</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QToolButton" name="toolButtonUpTop">
-            <property name="text">
-             <string>...</string>
+           <widget class="QComboBox" name="comboBoxPattern">
+            <property name="maximumSize">
+             <size>
+              <width>150</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="editable">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QToolButton" name="toolButtonRootTop">
+           <widget class="QPushButton" name="pushButton">
+            <property name="maximumSize">
+             <size>
+              <width>25</width>
+              <height>16777215</height>
+             </size>
+            </property>
             <property name="text">
-             <string>...</string>
+             <string>/</string>
             </property>
            </widget>
           </item>
          </layout>
         </item>
         <item>
-         <widget class="QTableWidget" name="tableWidgetTop">
+         <widget class="QTableWidget" name="tableWidget">
           <attribute name="horizontalHeaderStretchLastSection">
            <bool>true</bool>
           </attribute>
+          <attribute name="verticalHeaderVisible">
+           <bool>true</bool>
+          </attribute>
           <column>
            <property name="text">
-            <string>Type</string>
+            <string>Modified</string>
            </property>
           </column>
           <column>
@@ -71,12 +108,7 @@
           </column>
           <column>
            <property name="text">
-            <string>Modified</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Attributes</string>
+            <string>Type</string>
            </property>
           </column>
           <column>
@@ -92,44 +124,81 @@
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <property name="spacing">
+           <number>0</number>
+          </property>
           <item>
-           <widget class="QComboBox" name="comboBoxPathBottom">
+           <widget class="QPushButton" name="pushButtonDevice_2">
+            <property name="maximumSize">
+             <size>
+              <width>25</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="comboBoxPath_2">
             <property name="editable">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QToolButton" name="toolButtonHistoryBottom">
+           <widget class="QPushButton" name="pushButtonUp_2">
+            <property name="maximumSize">
+             <size>
+              <width>25</width>
+              <height>16777215</height>
+             </size>
+            </property>
             <property name="text">
-             <string>...</string>
+             <string>^</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QToolButton" name="toolButtonUpBottom">
-            <property name="text">
-             <string>...</string>
+           <widget class="QComboBox" name="comboBoxPattern_2">
+            <property name="maximumSize">
+             <size>
+              <width>150</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="editable">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QToolButton" name="toolButtonRootBottom">
+           <widget class="QPushButton" name="pushButton_2">
+            <property name="maximumSize">
+             <size>
+              <width>25</width>
+              <height>16777215</height>
+             </size>
+            </property>
             <property name="text">
-             <string>...</string>
+             <string>/</string>
             </property>
            </widget>
           </item>
          </layout>
         </item>
         <item>
-         <widget class="QTableWidget" name="tableWidgetTop_2">
+         <widget class="QTableWidget" name="tableWidget_2">
           <attribute name="horizontalHeaderStretchLastSection">
            <bool>true</bool>
           </attribute>
+          <attribute name="verticalHeaderVisible">
+           <bool>true</bool>
+          </attribute>
           <column>
            <property name="text">
-            <string>Type</string>
+            <string>Modified</string>
            </property>
           </column>
           <column>
@@ -139,12 +208,7 @@
           </column>
           <column>
            <property name="text">
-            <string>Modified</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Attributes</string>
+            <string>Type</string>
            </property>
           </column>
           <column>

diff --git a/appl/reidos/reidos.pro b/appl/reidos/reidos.pro
index 15e78553d001d6f2160d2c8eaf907be3b1c5ea75..499926da524bc188b362488997f87ad38126f4f9 100644 (file)
--- a/appl/reidos/reidos.pro
+++ b/appl/reidos/reidos.pro
@@ -13,13 +13,17 @@ TEMPLATE = app
 
 INCLUDEPATH += . ../..
 
-SOURCES += main.cpp\
+SOURCES += \
         ../../gui/ReEdit.cpp \
         ../../gui/ReStateStorage.cpp \
         ../../gui/ReSettings.cpp \
         ../../gui/ReFileTree.cpp \
+        ../../base/ReMatcher.cpp \
         ../../base/ReFile.cpp \
+        ../../base/ReStringUtils.cpp \
+        ../../base/ReRandomizer.cpp \
         ../../os/ReFileSystem.cpp \
+        ../../os/ReCryptFileSystem.cpp \
        ../../base/ReLogger.cpp \
        ../../base/ReQStringUtils.cpp \
        ../../base/ReFileUtils.cpp \