Parcourir la source

Exported inactive channel and disconnected server icons

Server and Channel now switch to their inactive icons as appropriate

git-svn-id: http://svn.dmdirc.com/trunk@2527 00569f92-eb28-0410-84fd-f71c24880f
tags/0.5.5
Chris Smith il y a 16 ans
Parent
révision
a46d5592a6

+ 9
- 0
src/com/dmdirc/Channel.java Voir le fichier

292
         final ClientInfo me = server.getParser().getMyself();
292
         final ClientInfo me = server.getParser().getMyself();
293
         addLine("channelSelfJoin", "", me.getNickname(), me.getIdent(),
293
         addLine("channelSelfJoin", "", me.getNickname(), me.getIdent(),
294
                 me.getHost(), channelInfo.getName());
294
                 me.getHost(), channelInfo.getName());
295
+        
296
+        icon = IconManager.getIconManager().getIcon("channel");
297
+        iconUpdated(icon);        
295
     }
298
     }
296
     
299
     
297
     /**
300
     /**
318
      */
321
      */
319
     public void join() {
322
     public void join() {
320
         server.getParser().joinChannel(channelInfo.getName());
323
         server.getParser().joinChannel(channelInfo.getName());
324
+        
325
+        icon = IconManager.getIconManager().getIcon("channel");
326
+        iconUpdated(icon);        
321
     }
327
     }
322
     
328
     
323
     /**
329
     /**
336
     public void resetWindow() {
342
     public void resetWindow() {
337
         onChannel = false;
343
         onChannel = false;
338
         
344
         
345
+        icon = IconManager.getIconManager().getIcon("channel-inactive");
346
+        iconUpdated(icon);
347
+        
339
         window.updateNames(new ArrayList<ChannelClientInfo>());
348
         window.updateNames(new ArrayList<ChannelClientInfo>());
340
     }
349
     }
341
     
350
     

+ 10
- 1
src/com/dmdirc/Server.java Voir le fichier

270
      */
270
      */
271
     private void updateIcon() {
271
     private void updateIcon() {
272
         icon = IconManager.getIconManager().getIcon(
272
         icon = IconManager.getIconManager().getIcon(
273
-                serverInfo.getSSL() ? "secure-server" : "server");
273
+                myState == ServerState.CONNECTED ?
274
+                    serverInfo.getSSL() ? "secure-server" : "server" : "server-disconnected");
274
         if (window != null) {
275
         if (window != null) {
275
             window.setFrameIcon(icon);
276
             window.setFrameIcon(icon);
276
 
277
 
664
 
665
 
665
             myState = ServerState.DISCONNECTED;
666
             myState = ServerState.DISCONNECTED;
666
         }
667
         }
668
+        
669
+        updateIcon();
667
 
670
 
668
         if (parser != null && parser.getSocketState() == IRCParser.STATE_OPEN) {
671
         if (parser != null && parser.getSocketState() == IRCParser.STATE_OPEN) {
669
             parser.disconnect(reason);
672
             parser.disconnect(reason);
1089
 
1092
 
1090
             myState = ServerState.TRANSIENTLY_DISCONNECTED;
1093
             myState = ServerState.TRANSIENTLY_DISCONNECTED;
1091
         }
1094
         }
1095
+        
1096
+        updateIcon();
1092
 
1097
 
1093
         if (configManager.getOptionBool(DOMAIN_GENERAL, "closechannelsondisconnect", false)) {
1098
         if (configManager.getOptionBool(DOMAIN_GENERAL, "closechannelsondisconnect", false)) {
1094
             closeChannels();
1099
             closeChannels();
1115
 
1120
 
1116
             myState = ServerState.TRANSIENTLY_DISCONNECTED;
1121
             myState = ServerState.TRANSIENTLY_DISCONNECTED;
1117
         }
1122
         }
1123
+        
1124
+        updateIcon();
1118
 
1125
 
1119
         String description;
1126
         String description;
1120
 
1127
 
1167
         }, delay * 1000);
1174
         }, delay * 1000);
1168
 
1175
 
1169
         myState = ServerState.RECONNECT_WAIT;
1176
         myState = ServerState.RECONNECT_WAIT;
1177
+        updateIcon();
1170
     }
1178
     }
1171
 
1179
 
1172
     /**
1180
     /**
1195
         synchronized(myState) {
1203
         synchronized(myState) {
1196
             myState = ServerState.CONNECTED;
1204
             myState = ServerState.CONNECTED;
1197
         }
1205
         }
1206
+        updateIcon();
1198
 
1207
 
1199
         configManager = new ConfigManager(parser.getIRCD(true), getNetwork(), getName());
1208
         configManager = new ConfigManager(parser.getIRCD(true), getNetwork(), getName());
1200
         updateIgnoreList();
1209
         updateIgnoreList();

BIN
src/com/dmdirc/res/channel-inactive.png Voir le fichier


BIN
src/com/dmdirc/res/server-disconnected.png Voir le fichier


Chargement…
Annuler
Enregistrer