ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.51 by root, Sat Jun 3 21:59:55 2006 UTC vs.
Revision 1.54 by root, Mon Jun 5 01:59:59 2006 UTC

… …
174 } 174 }
175} 175}
176 176
177sub stop_game { 177sub stop_game {
178 $LOGIN_BUTTON->set_text ("Login"); 178 $LOGIN_BUTTON->set_text ("Login");
179 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show; 180 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide; 181 $INV_WINDOW->hide;
181 $LOGVIEW->hide;
182 182
183 return unless $CONN; 183 return unless $CONN;
184 184
185 status "connection closed"; 185 status "connection closed";
186 186
… …
1100 $SETUP_DIALOG->show; 1100 $SETUP_DIALOG->show;
1101 }, 1101 },
1102 sub { 1102 sub {
1103 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1103 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1104 $SETUP_DIALOG->show; 1104 $SETUP_DIALOG->show;
1105 }); 1105 },
1106 );
1106 $SETUP_DIALOG->hide; 1107 $SETUP_DIALOG->hide;
1107 $::BIND_EDITOR->show; 1108 $::BIND_EDITOR->show;
1108 }, 1109 },
1109 ); 1110 );
1110 1111
… …
1208 $DEBUG_STATUS->show; 1209 $DEBUG_STATUS->show;
1209 1210
1210 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1211 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1211 1212
1212 $STATUSBOX = new CFClient::UI::Statusbox; 1213 $STATUSBOX = new CFClient::UI::Statusbox;
1213 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1214 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1214 1215
1215 (new CFClient::UI::Frame 1216 (new CFClient::UI::Frame
1216 bg => [0, 0, 0, 0.4], 1217 bg => [0, 0, 0, 0.4],
1217 force_x => 0, 1218 force_x => 0,
1218 force_y => "max", 1219 force_y => "max",
… …
1259 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1260 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1260 title => "Setup", 1261 title => "Setup",
1261 name => "setup_dialog", 1262 name => "setup_dialog",
1262 x => 'center', 1263 x => 'center',
1263 y => 'center', 1264 y => 'center',
1265 z => 2,
1264 force_w => $::WIDTH * 0.6, 1266 force_w => $::WIDTH * 0.6,
1265 force_h => $::HEIGHT * 0.6, 1267 force_h => $::HEIGHT * 0.6,
1266 ; 1268 ;
1267 1269
1268 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1270 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
… …
1276 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1278 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1277 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1279 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1278 "Configure the use of audio, sound effects and background music."); 1280 "Configure the use of audio, sound effects and background music.");
1279 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1281 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1280 "Lets you define, edit and delete bindings." 1282 "Lets you define, edit and delete bindings."
1281 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor " 1283 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1282 . "with nothing set and the recording started. After doing the actions you " 1284 . "with nothing set and the recording started. After doing the actions you "
1283 . "want to record press Insert and you will be asked to press a key-combo." 1285 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1284 . "After pressing the combo the binding will be saved automatically and the " 1286 . "After pressing the combo the binding will be saved automatically and the "
1285 . "binding editor closes"); 1287 . "binding editor closes");
1286 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1288 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1287 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1289 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1288 1290
… …
1298 1300
1299 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1300 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1302 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1302 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1304 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1303 ."You can also hit the <b>Tab</b>-key to show/hide the Inventory."); 1305 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1304 1306
1305 $BUTTONBAR->add (new CFClient::UI::Button 1307 $BUTTONBAR->add (new CFClient::UI::Button
1306 text => "Save Config", 1308 text => "Save Config",
1307 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1309 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1308 on_activate => sub { 1310 on_activate => sub {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines