Working Fuel-managed remote-url

No more FOSSIL_SETTING_REMOTE_URL uglyness


FossilOrigin-Name: 54518e5519ad4d5d478c815cc78859c9120997fe

ui/FslSettingsDialog.ui

@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>457</width>
-    <height>266</height>
+    <height>235</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -165,19 +165,6 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="1">
-       <widget class="QLineEdit" name="lineIgnoreCRNL">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>A comma separated list of glob-style file patterns to exclude from Fossil's CR/NL consistency checking</string>
-        </property>
-       </widget>
-      </item>
       <item row="4" column="0">
        <widget class="QLabel" name="label_7">
         <property name="minimumSize">
@@ -191,8 +178,8 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="1">
-       <widget class="QLineEdit" name="lineIgnore">
+      <item row="4" column="1">
+       <widget class="QLineEdit" name="lineIgnoreCRNL">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -200,7 +187,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>A comma separated list of glob-style file/path patterns ignored in Fossil file operations</string>
+         <string>A comma separated list of glob-style file patterns to exclude from Fossil's CR/NL consistency checking</string>
         </property>
        </widget>
       </item>
@@ -217,8 +204,8 @@
         </property>
        </widget>
       </item>
-      <item row="6" column="1">
-       <widget class="QLineEdit" name="lineRemoteURL">
+      <item row="5" column="1">
+       <widget class="QLineEdit" name="lineIgnore">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -226,22 +213,7 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>The remote url used to push/pull changes.
-URL style user names and passwords are also supported.
-For example http://username:password@server.com/fossil</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Remote Url</string>
+         <string>A comma separated list of glob-style file/path patterns ignored in Fossil file operations</string>
         </property>
        </widget>
       </item>

ui/MainWindow.ui

@@ -493,7 +493,7 @@
     <string>&amp;Push</string>
    </property>
    <property name="toolTip">
-    <string>Push changes to the remote repository</string>
+    <string>Push changes to the default remote repository</string>
    </property>
    <property name="statusTip">
     <string>Push changes to the remote repository</string>
@@ -511,7 +511,7 @@
     <string>Pu&amp;ll</string>
    </property>
    <property name="toolTip">
-    <string>Pull changes from the remote repository</string>
+    <string>Pull changes from the default remote repository</string>
    </property>
    <property name="statusTip">
     <string>Pull changes from the remote repository</string>
@@ -520,6 +520,36 @@
     <string>Ctrl+L</string>
    </property>
   </action>
+  <action name="actionPushRemote">
+   <property name="icon">
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icon-action-push</normaloff>:/icons/icon-action-push</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Push to Remote</string>
+   </property>
+   <property name="toolTip">
+    <string>Push changes to a remote repository</string>
+   </property>
+   <property name="statusTip">
+    <string>Push changes to a remote repository</string>
+   </property>
+  </action>
+  <action name="actionPullRemote">
+   <property name="icon">
+    <iconset resource="../rsrc/resources.qrc">
+     <normaloff>:/icons/icon-action-pull</normaloff>:/icons/icon-action-pull</iconset>
+   </property>
+   <property name="text">
+    <string>Pu&amp;ll from Remote</string>
+   </property>
+   <property name="toolTip">
+    <string>Pull changes from a remote repository</string>
+   </property>
+   <property name="statusTip">
+    <string>Pull changes from a remote repository</string>
+   </property>
+  </action>
   <action name="actionRename">
    <property name="icon">
     <iconset resource="../rsrc/resources.qrc">
@@ -986,6 +1016,22 @@
     <string>Edit Remote URL</string>
    </property>
   </action>
+  <action name="actionSetDefaultRemote">
+   <property name="text">
+    <string>Set Remote as Default</string>
+   </property>
+   <property name="statusTip">
+    <string>Makes the selected remote </string>
+   </property>
+  </action>
+  <action name="actionAddRemote">
+   <property name="text">
+    <string>Add Remote</string>
+   </property>
+   <property name="statusTip">
+    <string>Adds a Remote Url</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>