Changeset 274

Timestamp:

02/12/06 19:58:13 (3 years ago)

Author:

hipplej

Message:

QDir::rootPath() returns a string that ends with '/' (On Win32 at least) so we don't need to append a string that begins with '/'. The configuration dialog looks gargantuan on my tiny Tablet screen, but luckily we can use some sizer trickery to make it so that a hard coded minimum form size is unnecessary (in this case at least).

Location:

trunk/src

Files:

• config/vidaliasettings.cpp (modified) (2 diffs)
• gui/configdialog/configdialog.ui (modified) (8 diffs)

trunk/src/config/vidaliasettings.cpp

@@ -50 +50 @@
 /* Default Tor Settings */
 #if defined(Q_OS_WIN32)
-#define DEFAULT_TOR_PATH       (QDir::rootPath() + "\\Program Files\\Tor")
+#define DEFAULT_TOR_PATH       (QDir::rootPath() + "Program Files\\Tor")
 #elif defined(Q_OS_MACX)
 #define DEFAULT_TOR_PATH       "/usr/bin"
@@ -69 +69 @@
 
 #if defined(Q_OS_WIN32)
-#define DEFAULT_LOG_FILE       (QDir::rootPath() + "\\Program Files\\Tor\\tor.log")
+#define DEFAULT_LOG_FILE       (QDir::rootPath() + "Program Files\\Tor\\tor.log")
 #else
 #define DEFAULT_LOG_FILE       (QDir::homePath() + "/.tor/tor.log")

trunk/src/gui/configdialog/configdialog.ui

@@ -9 +9 @@
     <x>0</x>
     <y>0</y>
-    <width>650</width>
-    <height>500</height>
+    <width>581</width>
+    <height>388</height>
    </rect>
-  </property>
-  <property name="minimumSize" >
-   <size>
-    <width>650</width>
-    <height>500</height>
-   </size>
   </property>
   <property name="palette" >
@@ -302 +296 @@
   </property>
   <property name="windowIcon" >
-   <iconset/>
+   <iconset resource="..\res\vidalia.qrc" >:/images/tor_logo16.png</iconset>
   </property>
   <property name="sizeGripEnabled" >
@@ -377 +371 @@
       </property>
       <property name="icon" >
-       <iconset resource="..\res\vidalia.qrc">:/images/config_general.png</iconset>
+       <iconset resource="..\res\vidalia.qrc" >:/images/config_general.png</iconset>
       </property>
      </item>
@@ -385 +379 @@
       </property>
       <property name="icon" >
-       <iconset resource="..\res\vidalia.qrc">:/images/config_advanced.png</iconset>
+       <iconset resource="..\res\vidalia.qrc" >:/images/config_advanced.png</iconset>
       </property>
      </item>
@@ -554 +548 @@
            <layout class="QVBoxLayout" >
             <property name="margin" >
-             <number>4</number>
+             <number>9</number>
             </property>
             <property name="spacing" >
-             <number>3</number>
+             <number>9</number>
             </property>
             <item>
-             <widget class="QLabel" name="lblTorConfig" >
-              <property name="font" >
-               <font>
-                <family>Arial</family>
-                <pointsize>11</pointsize>
-                <weight>50</weight>
-                <italic>false</italic>
-                <bold>false</bold>
-                <underline>false</underline>
-                <strikeout>false</strikeout>
-               </font>
+             <widget class="QLabel" name="lblConfigFile" >
+              <property name="minimumSize" >
+               <size>
+                <width>370</width>
+                <height>30</height>
+               </size>
+              </property>
+              <property name="contextMenuPolicy" >
+               <enum>Qt::NoContextMenu</enum>
               </property>
               <property name="text" >
@@ -641 +633 @@
             </property>
             <property name="spacing" >
-             <number>6</number>
+             <number>9</number>
             </property>
             <item>
-             <widget class="QLabel" name="label" >
-              <property name="font" >
-               <font>
-                <family>Arial</family>
-                <pointsize>11</pointsize>
-                <weight>50</weight>
-                <italic>false</italic>
-                <bold>false</bold>
-                <underline>false</underline>
-                <strikeout>false</strikeout>
-               </font>
+             <widget class="QLabel" name="lblPortLabel" >
+              <property name="minimumSize" >
+               <size>
+                <width>370</width>
+                <height>65</height>
+               </size>
+              </property>
+              <property name="contextMenuPolicy" >
+               <enum>Qt::NoContextMenu</enum>
               </property>
               <property name="text" >
@@ -674 +664 @@
               <item>
                <widget class="QLineEdit" name="lineControlPort" >
+                <property name="sizePolicy" >
+                 <sizepolicy>
+                  <hsizetype>0</hsizetype>
+                  <vsizetype>0</vsizetype>
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
                 <property name="maximumSize" >
                  <size>
-                  <width>50</width>
-                  <height>50</height>
+                  <width>55</width>
+                  <height>16777215</height>
                  </size>
                 </property>
-                <property name="maxLength" >
-                 <number>5</number>
-                </property>
-                <property name="alignment" >
-                 <set>Qt::AlignRight</set>
+                <property name="contextMenuPolicy" >
+                 <enum>Qt::NoContextMenu</enum>
+                </property>
+                <property name="text" >
+                 <string>9051</string>
                 </property>
                </widget>
@@ -695 +693 @@
                 <property name="sizeHint" >
                  <size>
-                  <width>40</width>
+                  <width>221</width>
                   <height>20</height>
                  </size>