Commit 7410637b authored by Justin Hipple's avatar Justin Hipple
Browse files

QDir::rootPath() returns a string that ends with '/' (On Win32 at least) so we... 

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).

svn:r274
parent d107f0f4

src/config/vidaliasettings.cpp

+2 −2
Changes for src/config/vidaliasettings.cpp: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 


/* 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"

#else
@@ -68,7 +68,7 @@ 
#define DEFAULT_ENABLE_LOG_FILE false



#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")

#endif

src/gui/configdialog/configdialog.ui

+39 −41
Changes for src/gui/configdialog/configdialog.ui: 39 added lines, 41 removed lines.
Original line number Diff line number Diff line
@@ -8,16 +8,10 @@ 
   <rect>

    <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" >

   <palette>

    <active>
@@ -301,7 +295,7 @@ 
   <string>Configure Settings</string>

  </property>

  <property name="windowIcon" >

   <iconset/>

   <iconset resource="..\res\vidalia.qrc" >:/images/tor_logo16.png</iconset>

  </property>

  <property name="sizeGripEnabled" >

   <bool>true</bool>
@@ -553,23 +547,21 @@ 
           </property>

           <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" >

               <string>Vidalia can start Tor using an alternate Tor configuration file (torrc). If you would like to use a specific torrc, specify it below.</string>
@@ -640,20 +632,18 @@ 
             <number>9</number>

            </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" >

               <string>The control port is the port Vidalia uses to communicate with Tor. You only need to change this value if you have a service running on your machine that conflicts with the default port of 9051.</string>
@@ -673,17 +663,25 @@ 
              </property>

              <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 name="contextMenuPolicy" >

                 <enum>Qt::NoContextMenu</enum>

                </property>

                <property name="alignment" >

                 <set>Qt::AlignRight</set>

                <property name="text" >

                 <string>9051</string>

                </property>

               </widget>

              </item>
@@ -694,7 +692,7 @@ 
                </property>

                <property name="sizeHint" >

                 <size>

                  <width>40</width>

                  <width>221</width>

                  <height>20</height>

                 </size>

                </property>