Updating the new version.inc (DO keep this current when you commit if possible,

and always update it after protocol changes!) and disabling the old identity dialog
in order to not confuse people too much.
So now editing networks means using the _old_ serverlist dialog and the _new_ identity
dialog, and restarting the core afterwards (since the settings are only read at startup
until we have new settings in place).

diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui
index 5b96bf5..0286133 100644 (file)
--- a/src/qtui/ui/mainwin.ui
+++ b/src/qtui/ui/mainwin.ui
@@ -168,6 +168,9 @@
    </property>
   </action>
   <action name="actionEditIdentities" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
    <property name="text" >
     <string>Edit Identities...</string>
    </property>
@@ -229,7 +232,7 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/network-disconnect.png</iconset>
+    <iconset/>
    </property>
    <property name="text" >
     <string>Disconnect from Core</string>
@@ -240,7 +243,7 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/network-connect.png</iconset>
+    <iconset/>
    </property>
    <property name="text" >
     <string>Connect to Core...</string>

diff --git a/src/qtui/ui/networkeditdlg.ui b/src/qtui/ui/networkeditdlg.ui
index b909b9d..d7633d0 100644 (file)
--- a/src/qtui/ui/networkeditdlg.ui
+++ b/src/qtui/ui/networkeditdlg.ui
@@ -97,10 +97,17 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="QComboBox" name="identityList" />
+        <widget class="QComboBox" name="identityList" >
+         <property name="enabled" >
+          <bool>false</bool>
+         </property>
+        </widget>
        </item>
        <item>
         <widget class="QPushButton" name="editIdentities" >
+         <property name="enabled" >
+          <bool>false</bool>
+         </property>
          <property name="sizePolicy" >
           <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
            <horstretch>0</horstretch>
@@ -279,7 +286,7 @@
          <item>
           <widget class="QTextEdit" name="performEdit" >
            <property name="enabled" >
-            <bool>true</bool>
+            <bool>false</bool>
            </property>
            <property name="lineWrapMode" >
             <enum>QTextEdit::NoWrap</enum>

diff --git a/version.inc b/version.inc
index 653864e..2f02d5a 100644 (file)
--- a/version.inc
+++ b/version.inc
@@ -4,15 +4,15 @@
 { using namespace Global;
 
   quasselVersion = "0.2.0-pre";
-  quasselDate = "2008-01-12";
-  quasselBuild = 344;
+  quasselDate = "2008-01-17";
+  quasselBuild = 355;
 
   //! Minimum client build number the core needs
-  clientBuildNeeded = 344;
+  clientBuildNeeded = 355;
   clientVersionNeeded = quasselVersion;
 
   //! Minimum core build number the client needs
-  coreBuildNeeded = 344;
+  coreBuildNeeded = 355;
   coreVersionNeeded = quasselVersion;
 
 }