Changeset 4457

Timestamp:

01/31/07 11:31:48 (2 years ago)

Author:

morris

Message:

Add reconnect toolbar item

Files:

• WiredClient/trunk/English.lproj/Localizable.strings (modified) (5 diffs)
• WiredClient/trunk/English.lproj/PublicChat.nib/keyedobjects.nib (modified) (previous)
• WiredClient/trunk/English.lproj/ReleaseNotes.rtf (modified) (1 diff)
• WiredClient/trunk/French.lproj/Localizable.strings (modified) (11 diffs)
• WiredClient/trunk/German.lproj/Localizable.strings (modified) (10 diffs)
• WiredClient/trunk/Japanese.lproj/Localizable.strings (modified) (10 diffs)
• WiredClient/trunk/Reconnect.tiff (added)
• WiredClient/trunk/WCConnectionController.m (modified) (1 diff)
• WiredClient/trunk/WCPublicChat.m (modified) (3 diffs)
• WiredClient/trunk/WiredClient.xcodeproj/project.pbxproj (modified) (4 diffs)

WiredClient/trunk/English.lproj/Localizable.strings

@@ -271 +271 @@
-
-/* Disconnect toolbar item
-dialog button
-menu item
+menu item
+dialog button
-"Disconnect" = "Disconnect";
-
@@ -309 +309 @@
-"File or Folder Not Found" = "File or Folder Not Found";
-
+/* File plural */
+"files" = "files";
+
-/* Files toolbar item */
-"Files" = "Files";
-
-/* File plural */
-"files" = "files";
-
-/* Transfer finished (files, transferred, speed, time) */
@@ -406 +406 @@
-"Message Received" = "Message Received";
-
+/* Message plural */
+"messages" = "messages";
+
-/* Messages toolbar item
-   Messages window title */
-"Messages" = "Messages";
-
-/* Message plural */
-"messages" = "messages";
-
-/* Smiley */
@@ -466 +466 @@
-/* Ping received message (interval) */
-"Received ping reply after %.2fms" = "Received ping reply after %.2fms";
+
+/* Disconnect toolbar item */
+"Reconnect" = "Reconnect";
-
-/* Restore all layouts to default dialog title */
@@ -554 +557 @@
-"The folder \"%@\" already exists." = "The folder \"%@\" already exists.";
-
-path
+number
-"The folder contains %u files with resource forks, which are not handled by Wired. Only the data parts will be uploaded, possibly resulting in corrupted files. Please use an archiver to ensure the files will be uploaded correctly." = "The folder contains %u files with resource forks, which are not handled by Wired. Only the data parts will be uploaded, possibly resulting in corrupted files. Please use an archiver to ensure the files will be uploaded correctly.";
-

WiredClient/trunk/English.lproj/ReleaseNotes.rtf

@@ -34 +34 @@
-- Don't scroll chat to bottom after changing preferences\
-- Don't close the chat window when disconnecting\
+- Add a reconnect toolbar item\
-- Localization updates
-\f0\b \cf2 \

WiredClient/trunk/French.lproj/Localizable.strings

@@ -70 +70 @@
-"%@: %@" = "%1$@: %2$@";
-
-
-
+
-"%d %@, %@ total" = "%1$d %2$@, %3$@ totalisé";
-
@@ -169 +168 @@
-/* Delete bookmark dialog button title
-   Delete ignore dialog button title
+   Transfers overwrite alert button
-   Delete file button title
-   Restore all layouts to default dialog button title
@@ -299 +299 @@
-"file" = "fichier";
-
-
+
+
-"File Exists" = "Fichier existant";
-
@@ -341 +342 @@
-"General" = "Généralité";
-
+/* Account type */
+"Group" = "Groupe";
+
-/* Group singular */
-"group" = "groupe";
-
-/* Account type */
-"Group" = "Groupe";
-
-/* Group plural */
@@ -393 +394 @@
-"Login Failed" = "Echec d’identification";
-
+/* Disconnected chat message */
+"Lost connection to %@" = "Connexion perdue avec %@";
+
-/* Make layout default dialog title */
-"Make Current Layout Default?" = "Définir la disposition par défaut?";
@@ -401 +405 @@
-/* Event */
-"Message Received" = "Message reçu";
+
+/* Message plural */
+"messages" = "messages";
-
-/* Messages toolbar item
-   Messages window title */
-"Messages" = "Messages";
-
-/* Message plural */
-"messages" = "messages";
-
-/* Smiley */
@@ -430 +434 @@
-"Open Failed" = "Echec d’ouverture";
-
+/* Transfers overwrite alert button */
+"Overwrite" = "Remplacer";
+
-/* Wired Protocol error 516 title */
-"Permission Denied" = "Permission refusée";
@@ -454 +461 @@
-"Queued at position %u" = "En attente à la position %u";
-
+/* Disconnected chat message */
+"Re-established connection to %@" = "Ré-établir la connexion avec %@";
+
-/* Ping received message (interval) */
-"Received ping reply after %.2fms" = "Réception d’une réponse de \"ping\" après %.2fms";
+
+/* Disconnect toolbar item */
+"Reconnect" = "Reconnecter";
-
-/* Restore all layouts to default dialog title */
@@ -535 +548 @@
-"The file \"%@\" already exists." = "Le fichier \"%@\" existe déjà.";
-
+/* Transfers overwrite alert title */
+"The file \"%@\" already exists. Overwrite?" = "Le fichier \"%@\" existe déjà. Remplacer?";
+
-/* Error (path) */
-"The file \"%@\" has a resource fork, which is not handled by Wired. Only the data part will be uploaded, possibly resulting in a corrupted file. Please use an archiver to ensure the file will be uploaded correctly." = "Le fichier \"%@\" comprend un ensemble de données non reconnues par Wired. Seules les données seront envoyées, pouvant causer la corruption du fichier. Utilisez de préférence une archive du fichier pour garantir son intégrité.";
@@ -541 +557 @@
-"The folder \"%@\" already exists." = "Le dossier \"%@\" existé déjà.";
-
-path
+number
-"The folder contains %u files with resource forks, which are not handled by Wired. Only the data parts will be uploaded, possibly resulting in corrupted files. Please use an archiver to ensure the files will be uploaded correctly." = "Le dossier \"%@\" comprend des fichiers non reconnues par Wired. Seules les données seront envoyées, pouvant causer la corruption de fichier. Utilisez de préférence une archive du dossier pour garantir son intégrité.";
-
@@ -627 +643 @@
-"Uploads Folder" = "Dossier d’envois";
-
+/* Account type */
+"User" = "Utilisateur";
+
-/* User singular */
-"user" = "utilisateur";
-
-/* Account type */
-"User" = "Utilisateur";
-
-/* Event */
-"User Changed Nick" = "Un membre a changé de pseudo";

WiredClient/trunk/German.lproj/Localizable.strings

@@ -70 +70 @@
-"%@: %@" = "%1$@: %2$@";
-
-
-
+
-"%d %@, %@ total" = "%1$d %2$@, %3$@ gesamt";
-
@@ -169 +168 @@
-/* Delete bookmark dialog button title
-   Delete ignore dialog button title
+   Transfers overwrite alert button
-   Delete file button title
-   Restore all layouts to default dialog button title
@@ -299 +299 @@
-"file" = "Datei";
-
-
+
+
-"File Exists" = "Datei bereits vorhanden";
-
@@ -341 +342 @@
-"General" = "Allgemein";
-
+/* Account type */
+"Group" = "Gruppe";
+
-/* Group singular */
-"group" = "Gruppe";
-
-/* Account type */
-"Group" = "Gruppe";
-
-/* Group plural */
@@ -393 +394 @@
-"Login Failed" = "Verbindung fehlgeschlagen";
-
+/* Disconnected chat message */
+"Lost connection to %@" = "Lost connection to %@";
+
-/* Make layout default dialog title */
-"Make Current Layout Default?" = "Jetziges Layout zu Standard machen?";
@@ -401 +405 @@
-/* Event */
-"Message Received" = "Nachricht erhalten";
+
+/* Message plural */
+"messages" = "Nachrichten";
-
-/* Messages toolbar item
-   Messages window title */
-"Messages" = "Nachrichten";
-
-/* Message plural */
-"messages" = "Nachrichten";
-
-/* Smiley */
@@ -430 +434 @@
-"Open Failed" = "Öffnen fehlgeschlagen";
-
+/* Transfers overwrite alert button */
+"Overwrite" = "Overwrite";
+
-/* Wired Protocol error 516 title */
-"Permission Denied" = "Zugriff verweigert";
@@ -454 +461 @@
-"Queued at position %u" = "Wartend an Stelle %u";
-
+/* Disconnected chat message */
+"Re-established connection to %@" = "Re-established connection to %@";
+
-/* Ping received message (interval) */
-"Received ping reply after %.2fms" = "Ping-Antwort erhalten nach %.2fms";
+
+/* Disconnect toolbar item */
+"Reconnect" = "Wieder verbinden";
-
-/* Restore all layouts to default dialog title */
@@ -534 +547 @@
-/* Error (path) */
-"The file \"%@\" already exists." = "Die Datei \"%@\" ist bereits vorhanden.";
+
+/* Transfers overwrite alert title */
+"The file \"%@\" already exists. Overwrite?" = "The file \"%@\" already exists. Overwrite?";
-
-/* Error (path) */
@@ -627 +643 @@
-"Uploads Folder" = "Ordner zum Heraufladen";
-
+/* Account type */
+"User" = "Benutzer";
+
-/* User singular */
-"user" = "Benutzer";
-
-/* Account type */
-"User" = "Benutzer";
-
-/* Event */
-"User Changed Nick" = "Benutzer wechselte Spitznamen";

WiredClient/trunk/Japanese.lproj/Localizable.strings

@@ -70 +70 @@
-"%@: %@" = "%1$@: %2$@";
-
-
-
+
-"%d %@, %@ total" = "合計: %1$d %2$@で %3$@";
-
@@ -169 +168 @@
-/* Delete bookmark dialog button title
-   Delete ignore dialog button title
+   Transfers overwrite alert button
-   Delete file button title
-   Restore all layouts to default dialog button title
@@ -299 +299 @@
-"file" = "ファイル";
-
-
+
+
-"File Exists" = "同名のファイルが存在するとき";
-
@@ -341 +342 @@
-"General" = "全般";
-
+/* Account type */
+"Group" = "グループ";
+
-/* Group singular */
-"group" = "グループ";
-
-/* Account type */
-"Group" = "グループ";
-
-/* Group plural */
@@ -393 +394 @@
-"Login Failed" = "ログインに失敗しました";
-
+/* Disconnected chat message */
+"Lost connection to %@" = "%@ さんとの接続が切れました";
+
-/* Make layout default dialog title */
-"Make Current Layout Default?" = "このレイアウトをデフォルトにしますか？";
@@ -401 +405 @@
-/* Event */
-"Message Received" = "メッセージの受信";
+
+/* Message plural */
+"messages" = "メッセージ";
-
-/* Messages toolbar item
-   Messages window title */
-"Messages" = "メッセージ";
-
-/* Message plural */
-"messages" = "メッセージ";
-
-/* Smiley */
@@ -430 +434 @@
-"Open Failed" = "開くことができませんでした";
-
+/* Transfers overwrite alert button */
+"Overwrite" = "上書き";
+
-/* Wired Protocol error 516 title */
-"Permission Denied" = "アクセス権がありません";
@@ -454 +461 @@
-"Queued at position %u" = "%u 番目のキューに入っています";
-
+/* Disconnected chat message */
+"Re-established connection to %@" = "%@ さんとの接続が再開されました";
+
-/* Ping received message (interval) */
-"Received ping reply after %.2fms" = "%.2fms 後に ping 応答を受信しました";
+
+/* Disconnect toolbar item */
+"Reconnect" = "接続し直す";
-
-/* Restore all layouts to default dialog title */
@@ -534 +547 @@
-/* Error (path) */
-"The file \"%@\" already exists." = "同名のファイル“%@”がすでに存在します。";
+
+/* Transfers overwrite alert title */
+"The file \"%@\" already exists. Overwrite?" = "ファイル“%@”はすでに存在します。上書きしますか？";
-
-/* Error (path) */
@@ -627 +643 @@
-"Uploads Folder" = "アップロードフォルダ";
-
+/* Account type */
+"User" = "ユーザ";
+
-/* User singular */
-"user" = "ユーザ";
-
-/* Account type */
-"User" = "ユーザ";
-
-/* Event */
-"User Changed Nick" = "ユーザによるハンドルネームの変更";

WiredClient/trunk/WCConnectionController.m

@@ -392 +392 @@
-                return (connected && ![[self connection] isDisconnecting]);
-        else if(selector == @selector(reconnect:))
-!connected
+(!connected && ![[self connection] isReconnecting])
-        else if(selector == @selector(files:) || selector == @selector(postNews:) || selector == @selector(broadcast:))
-                return connected;

WiredClient/trunk/WCPublicChat.m

@@ -152 +152 @@
-        [_toolbarItems setObject:item forKey:[item itemIdentifier]];
-
+        // --- reconnect
+        item = [NSToolbarItem toolbarItemWithIdentifier:@"Reconnect"
+                                                                                           name:NSLS(@"Reconnect", @"Disconnect toolbar item")
+                                                                                        content:[NSImage imageNamed:@"Reconnect"]
+                                                                                         target:self
+                                                                                         action:@selector(reconnect:)];
+        [_toolbarItems setObject:item forKey:[item itemIdentifier]];
+
-        // --- banner
-        button = [[NSButton alloc] init];
@@ -275 +283 @@
-                @"Transfers",
-                @"Accounts",
+                @"Reconnect",
-                @"Disconnect",
-                @"Banner",
@@ -532 +541 @@
-        connected = [[self connection] isConnected];
-        
-
+
+
+
-                return (connected && ![[self connection] isDisconnecting] && [NSApp isActive]);
-        else if(selector == @selector(files:))

WiredClient/trunk/WiredClient.xcodeproj/project.pbxproj

@@ -45 +45 @@
-
-/* Begin PBXBuildFile section */
+                771BDE730B70A6CC00E14B79 /* Reconnect.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 771BDE720B70A6CC00E14B79 /* Reconnect.tiff */; };
-                771E6D510755F506000F9195 /* WCConversation.m in Sources */ = {isa = PBXBuildFile; fileRef = 771E6D4F0755F506000F9195 /* WCConversation.m */; };
-                777D36C50987E125005B5EC1 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 777D36C40987E125005B5EC1 /* WebKit.framework */; };
@@ -288 +289 @@
-                29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-                32CA4F630368D1EE00C91783 /* prefix.pch */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = prefix.pch; sourceTree = "<group>"; };
+                771BDE720B70A6CC00E14B79 /* Reconnect.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Reconnect.tiff; sourceTree = "<group>"; };
-                771E6D4E0755F506000F9195 /* WCConversation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WCConversation.h; sourceTree = "<group>"; };
-                771E6D4F0755F506000F9195 /* WCConversation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WCConversation.m; sourceTree = "<group>"; };
@@ -1086 +1088 @@
-                                A545381205FA777E005C82FE /* Preview.tiff */,
-                                A5E225C5057AB5290037C7F9 /* PrivateChat.tiff */,
+                                771BDE720B70A6CC00E14B79 /* Reconnect.tiff */,
-                                77E555C607534701009A7557 /* RedDrop.tiff */,
-                                A5E225D4057AB5290037C7F9 /* Reload.tiff */,
@@ -1348 +1351 @@
-                                A545381305FA777E005C82FE /* Preview.tiff in Resources */,
-                                A5E225FB057AB52A0037C7F9 /* PrivateChat.tiff in Resources */,
+                                771BDE730B70A6CC00E14B79 /* Reconnect.tiff in Resources */,
-                                77E555C707534701009A7557 /* RedDrop.tiff in Resources */,
-                                A5E2260A057AB52A0037C7F9 /* Reload.tiff in Resources */,