Bläddra i källkod

Add missing treeview defaults

Fixed browser launch delay prefs option using the wrong setting
tags/0.6.3m1rc1
Chris Smith 15 år sedan
förälder
incheckning
e53788f70d

+ 4
- 0
src/com/dmdirc/config/defaults/default/defaults Visa fil

@@ -163,7 +163,9 @@ ui:
163 163
   shownickcoloursintext=false
164 164
   showversion=true
165 165
   stylelinks=true
166
+  treeviewActiveBackground=false:f0f0f0
166 167
   treeviewActiveBold=true
168
+  treeviewActiveForeground=false:1
167 169
   treeviewRolloverColour=false:f0f0f0
168 170
   useOneTouchExpandable=false
169 171
 
@@ -171,6 +173,8 @@ treeview:
171 173
   dragSelection=true
172 174
   sortwindows=true
173 175
   sortservers=true
176
+  backgroundcolour=false:0
177
+  foregroundcolour=false:0
174 178
 
175 179
 channel:
176 180
   splitusermodes=false

+ 1
- 1
src/com/dmdirc/config/prefs/PreferencesManager.java Visa fil

@@ -333,7 +333,7 @@ public class PreferencesManager {
333 333
         options.put("showWhenMaximised", "Show only when windows maximised");
334 334
 
335 335
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
336
-                "browser", "userlaunchdelay", "Use browser launch delay",
336
+                "browser", "uselaunchdelay", "Use browser launch delay",
337 337
                 "Enable delay between browser launches (to prevent mistakenly" +
338 338
                 " double clicking)?"));
339 339
         category.addSetting(new PreferencesSetting(PreferencesType.DURATION,

+ 3
- 6
src/com/dmdirc/config/prefs/PreferencesSetting.java Visa fil

@@ -299,12 +299,9 @@ public class PreferencesSetting {
299 299
      * @return true iif the setting will be changed if saved
300 300
      */
301 301
     public boolean needsSaving() {
302
-        if ((current != null && current.equals(original)) 
303
-                || (current == null && original == null)
304
-                || (validator != null && validator.validate(current).isFailure())) {
305
-            return false;
306
-        }
307
-        return true;
302
+        return (current == null || !current.equals(original))
303
+                && (current != null || original != null)
304
+                && (validator == null || !validator.validate(current).isFailure());
308 305
     }
309 306
 
310 307
 }

Laddar…
Avbryt
Spara