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.80 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.87 by root, Sun Jul 2 21:41:34 2006 UTC

… …
85our $CONSOLE; 85our $CONSOLE;
86our $METASERVER; 86our $METASERVER;
87our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
88our $QUIT_DIALOG; 88our $QUIT_DIALOG;
89our $HOST_ENTRY; 89our $HOST_ENTRY;
90our $PICKUP_ENABLE;
90our $SERVER_INFO; 91our $SERVER_INFO;
91 92
92our $SETUP_DIALOG; 93our $SETUP_DIALOG;
93our $SETUP_NOTEBOOK; 94our $SETUP_NOTEBOOK;
94our $SETUP_SERVER; 95our $SETUP_SERVER;
95our $SETUP_KEYBOARD; 96our $SETUP_KEYBOARD;
96our $SETUP_SPELLS;
97 97
98our $PL_NOTEBOOK;
98our $STATS_WINDOW; 99our $PL_WINDOW;
100
101our $INVENTORY_PAGE;
102our $STATS_PAGE;
103our $SPELL_PAGE;
104
105our $HELP_WINDOW;
99our $MESSAGE_WINDOW; 106our $MESSAGE_WINDOW;
100our $FLOORBOX; 107our $FLOORBOX;
101our $GAUGES; 108our $GAUGES;
102our $STATWIDS; 109our $STATWIDS;
103 110
… …
110 117
111our $ALT_ENTER_MESSAGE; 118our $ALT_ENTER_MESSAGE;
112our $STATUSBOX; 119our $STATUSBOX;
113our $DEBUG_STATUS; 120our $DEBUG_STATUS;
114 121
115our $INV_WINDOW;
116our $INV; 122our $INV;
117our $INVR; 123our $INVR;
118our $INV_RIGHT_HB; 124our $INV_RIGHT_HB;
119 125
120our $BIND_EDITOR; 126our $BIND_EDITOR;
… …
221 $conn->send ("reply $stat"); 227 $conn->send ("reply $stat");
222 destroy_query_dialog $conn; 228 destroy_query_dialog $conn;
223 return; 229 return;
224 } 230 }
225 231
226 $STATS_WINDOW->show; 232 $STATS_PAGE->show;
227 $MESSAGE_WINDOW->hide; 233 $MESSAGE_WINDOW->hide;
228 234
229 unshift @dialog, new CFClient::UI::Label 235 unshift @dialog, new CFClient::UI::Label
230 max_w => $::WIDTH * 0.4, 236 max_w => $::WIDTH * 0.4,
231 ellipsise => 0, 237 ellipsise => 0,
… …
271 # right: accept 277 # right: accept
272 $table->add (4, 0, new CFClient::UI::Button 278 $table->add (4, 0, new CFClient::UI::Button
273 text => "Accept", 279 text => "Accept",
274 on_activate => sub { 280 on_activate => sub {
275 $conn->send ("reply n"); 281 $conn->send ("reply n");
276 $STATS_WINDOW->hide; 282 $STATS_PAGE->hide;
277 destroy_query_dialog $conn; 283 destroy_query_dialog $conn;
278 0 284 0
279 }, 285 },
280 ); 286 );
281 287
… …
373 379
374sub stop_game { 380sub stop_game {
375 $LOGIN_BUTTON->set_text ("Login"); 381 $LOGIN_BUTTON->set_text ("Login");
376 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 382 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
377 $SETUP_DIALOG->show; 383 $SETUP_DIALOG->show;
378 $INV_WINDOW->hide; 384 $PL_WINDOW->hide;
379 $SETUP_SPELLS->clear_spells; 385 $SPELL_PAGE->clear_spells;
380 386
381 return unless $CONN; 387 return unless $CONN;
382 388
383 status "connection closed"; 389 status "connection closed";
384 390
… …
653 659
654 $table 660 $table
655} 661}
656 662
657sub stats_window { 663sub stats_window {
658 my $tgw = new CFClient::UI::FancyFrame 664 my $tgw =
659 y => $HEIGHT * (2/8), 665 new CFClient::UI::Window
660 x => "max", 666 child => my $vb = new CFClient::UI::VBox;
661 title => "Stats",
662 name => "stats_window",
663 has_close_button => 1;
664 667
665 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
666 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 668 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
667 can_hover => 1, can_events => 1, 669 can_hover => 1, can_events => 1,
668 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
669 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 671 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
670 can_hover => 1, can_events => 1, 672 can_hover => 1, can_events => 1,
… …
694 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 696 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
695 697
696 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 698 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
697 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 699 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
698 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 700 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
699 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 701 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
700 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 702 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
701 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 703 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
702 ) { 704 ) {
703 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 705 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
704 706
… …
723 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 725 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
724 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 726 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
725 pois => "<b>Poison</b> (resistance to getting poisoned)", 727 pois => "<b>Poison</b> (resistance to getting poisoned)",
726 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 728 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
727 deat => "<b>Death</b> (resistance against death spells)", 729 deat => "<b>Death</b> (resistance against death spells)",
728 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 730 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)",
729 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 731 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
730 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 732 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
731 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 733 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
732 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 734 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
733 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 735 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
808 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 810 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
809 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 811 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
810 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 812 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
811 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 813 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
812 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 814 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
813 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 815 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
815 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 817 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
816 818
817 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 819 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
818 820
… …
842} 844}
843 845
844my $METASERVER_ATIME; 846my $METASERVER_ATIME;
845 847
846sub update_metaserver { 848sub update_metaserver {
849 my ($metaserver_dialog) = @_;
850
851 $METASERVER = $metaserver_dialog
852 if defined $metaserver_dialog;
853
847 return if $METASERVER_ATIME > time; 854 return if $METASERVER_ATIME > time;
848 $METASERVER_ATIME = time + 60; 855 $METASERVER_ATIME = time + 60;
849 856
850 my $table = $METASERVER->{table}; 857 my $table = $METASERVER->{table};
851 $table->clear; 858 $table->clear;
… …
939 } 946 }
940 }); 947 });
941} 948}
942 949
943sub metaserver_dialog { 950sub metaserver_dialog {
951 my $vbox = new CFClient::UI::VBox;
952 my $table = new CFClient::UI::Table;
953 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
954
944 my $dialog = new CFClient::UI::FancyFrame 955 my $dialog = new CFClient::UI::FancyFrame
945 title => "Server List", 956 title => "Server List",
946 name => 'metaserver_dialog', 957 name => 'metaserver_dialog',
947 x => 'center', 958 x => 'center',
948 y => 'center', 959 y => 'center',
949 z => 3, 960 z => 3,
950 force_h => $::HEIGHT * 0.4, 961 force_h => $::HEIGHT * 0.4,
951 child => (my $vbox = new CFClient::UI::VBox), 962 child => $vbox,
952 has_close_button => 1, 963 has_close_button => 1,
964 table => $table,
953 on_visibility_change => sub { 965 on_visibility_change => sub {
954 update_metaserver if $_[1]; 966 update_metaserver ($_[0]) if $_[1];
955 0 967 0
956 }, 968 },
957 ; 969 ;
958
959 $dialog->{table} = new CFClient::UI::Table;
960
961 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
962 970
963 $dialog 971 $dialog
964} 972}
965 973
966sub server_setup { 974sub server_setup {
… …
981 my ($self, $value) = @_; 989 my ($self, $value) = @_;
982 $CFG->{profile}{default}{host} = $value; 990 $CFG->{profile}{default}{host} = $value;
983 0 991 0
984 } 992 }
985 ); 993 );
986
987 $METASERVER = metaserver_dialog;
988 994
989 $vbox->add (new CFClient::UI::Button 995 $vbox->add (new CFClient::UI::Button
990 expand => 1, 996 expand => 1,
991 text => "Server List", 997 text => "Server List",
992 other => $METASERVER, 998 other => $METASERVER,
… …
1184sub autopickup_setup { 1190sub autopickup_setup {
1185 my $table = new CFClient::UI::Table; 1191 my $table = new CFClient::UI::Table;
1186 1192
1187 for ( 1193 for (
1188 ["General", 0, 0, 1194 ["General", 0, 0,
1189 ["Enable autopickup" => PICKUP_NEWMODE], 1195 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1190 ["Inhibit autopickup" => PICKUP_INHIBIT], 1196 ["Inhibit autopickup" => PICKUP_INHIBIT],
1191 ["Stop before pickup" => PICKUP_STOP], 1197 ["Stop before pickup" => PICKUP_STOP],
1192 ["Debug autopickup" => PICKUP_DEBUG], 1198 ["Debug autopickup" => PICKUP_DEBUG],
1193 ], 1199 ],
1194 ["Weapons", 0, 6, 1200 ["Weapons", 0, 6,
… …
1231 for (@bits) { 1237 for (@bits) {
1232 ++$y; 1238 ++$y;
1233 1239
1234 my $mask = $_->[1]; 1240 my $mask = $_->[1];
1235 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1241 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1242 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1237 state => $CFG->{pickup} & $mask, 1243 state => $::CFG->{pickup} & $mask,
1238 on_changed => sub { 1244 on_changed => sub {
1239 my ($box, $value) = @_; 1245 my ($box, $value) = @_;
1240 1246
1241 if ($value) { 1247 if ($value) {
1242 $::CFG->{pickup} |= $mask; 1248 $::CFG->{pickup} |= $mask;
… …
1247 $::CONN->send_command ("pickup $::CFG->{pickup}") 1253 $::CONN->send_command ("pickup $::CFG->{pickup}")
1248 if defined $::CONN; 1254 if defined $::CONN;
1249 1255
1250 0 1256 0
1251 }); 1257 });
1258
1259 ${$_->[2]} = $checkbox if $_->[2];
1252 } 1260 }
1253 } 1261 }
1254 1262
1255 $table->add (2, 18, new CFClient::UI::ValSlider 1263 $table->add (2, 18, new CFClient::UI::ValSlider
1256 range => [0, 0, 16, 1, 1], 1264 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1265 template => ">= 99",
1257 to_value => sub { ">= " . 5 * $_[0] }, 1266 to_value => sub { ">= " . 5 * $_[0] },
1258 on_changed => sub { 1267 on_changed => sub {
1259 my ($slider, $value) = @_; 1268 my ($slider, $value) = @_;
1260 1269
1261 $::CFG->{pickup} &= ~0x7; 1270 $::CFG->{pickup} &= ~0xF;
1262 $::CFG->{pickup} |= int $value 1271 $::CFG->{pickup} |= int $value
1263 if $value; 1272 if $value;
1264 1; 1273 1;
1265 }); 1274 });
1275
1266 $table->add (3, 18, new CFClient::UI::Button 1276 $table->add (3, 18, new CFClient::UI::Button
1267 text => "set", 1277 text => "set",
1268 on_activate => sub { 1278 on_activate => sub {
1269 $::CONN->send_command ("pickup $::CFG->{pickup}") 1279 $::CONN->send_command ("pickup $::CFG->{pickup}")
1270 if defined $::CONN; 1280 if defined $::CONN;
… …
1272 }); 1282 });
1273 1283
1274 $table 1284 $table
1275} 1285}
1276 1286
1277sub inventory_window { 1287sub inventory_widget {
1288 my $hb = new CFClient::UI::HBox homogeneous => 1;
1289
1290 $hb->add (my $vb1 = new CFClient::UI::VBox);
1291 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1292 $vb1->add ($INV = new CFClient::UI::Inventory);
1293
1294 $hb->add (my $vb2 = new CFClient::UI::VBox);
1295
1296 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1297
1298 $vb2->add ($INVR = new CFClient::UI::Inventory);
1299
1300 # XXX: Call after $INVR = ... because set_opencont sets the items
1301 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1302
1303 $hb
1304}
1305
1306sub toggle_player_page {
1307 my ($widget) = @_;
1308
1309 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1310 $PL_WINDOW->hide;
1311 } else {
1312 $PL_NOTEBOOK->set_current_page ($widget);
1313 $PL_WINDOW->show;
1314 }
1315}
1316
1317sub player_window {
1278 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1318 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1279 x => "center", 1319 x => "center",
1280 y => "center", 1320 y => "center",
1281 force_w => $WIDTH * 9/10, 1321 force_w => $WIDTH * 9/10,
1282 force_h => $HEIGHT * 9/10, 1322 force_h => $HEIGHT * 9/10,
1283 title => "Inventory", 1323 title => "Player",
1284 has_close_button => 1, 1324 has_close_button => 1
1285 ; 1325 ;
1286 1326
1287 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1327 my $ntb =
1328 $PL_NOTEBOOK =
1329 new CFClient::UI::Notebook
1330 expand => 1,
1331 debug => 1,
1332 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1333 ;
1288 1334
1289 $hb->add (my $vb1 = new CFClient::UI::VBox); 1335 $ntb->add (
1290 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1336 "Stats &amp; Skills" => $STATS_PAGE = stats_window,
1291 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1337 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
1338 );
1339 $ntb->add (
1340 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1341 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1342 );
1343 $ntb->add (
1344 Inventory => $INVENTORY_PAGE = inventory_widget,
1345 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1346 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1347 );
1292 1348
1293 $hb->add (my $vb2 = new CFClient::UI::VBox);
1294 1349
1295 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1350 $plwin->add ($ntb);
1296 1351 $plwin
1297 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1298
1299 # XXX: Call after $INVR = ... because set_opencont sets the items
1300 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1301
1302 $invwin
1303}
1304
1305sub spell_setup {
1306 new CFClient::UI::SpellList
1307} 1352}
1308 1353
1309sub update_bindings { 1354sub update_bindings {
1310 $BIND_UPD_CB->() if $BIND_UPD_CB; 1355 $BIND_UPD_CB->() if $BIND_UPD_CB;
1311} 1356}
… …
1321 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1366 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1322 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1367 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1323 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1368 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1324 1369
1325 my $lbl = join "; ", @$cmds; 1370 my $lbl = join "; ", @$cmds;
1326 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1371 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1327 $binding_list->add (my $hb = new CFClient::UI::HBox); 1372 $binding_list->add (my $hb = new CFClient::UI::HBox);
1328 $hb->add (new CFClient::UI::Button 1373 $hb->add (new CFClient::UI::Button
1329 text => "delete", 1374 text => "delete",
1330 tooltip => "Deletes the binding", 1375 tooltip => "Deletes the binding",
1331 on_activate => sub { 1376 on_activate => sub {
… …
1424 y => 'center', 1469 y => 'center',
1425 z => 2, 1470 z => 2,
1426 name => 'doc_browser', 1471 name => 'doc_browser',
1427 force_w => int $WIDTH * 7/8, 1472 force_w => int $WIDTH * 7/8,
1428 force_h => int $HEIGHT * 7/8, 1473 force_h => int $HEIGHT * 7/8,
1429 title => "Documentation"; 1474 title => "Help Browser",
1475 has_close_button => 1;
1430 1476
1431 $win->add (my $vbox = new CFClient::UI::VBox); 1477 $win->add (my $vbox = new CFClient::UI::VBox);
1432 1478
1433 $vbox->add (my $buttons = new CFClient::UI::HBox); 1479 $vbox->add (my $buttons = new CFClient::UI::HBox);
1434 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1480 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1577 z => 2, 1623 z => 2,
1578 force_w => $::WIDTH * 0.6, 1624 force_w => $::WIDTH * 0.6,
1579 force_h => $::HEIGHT * 0.6, 1625 force_h => $::HEIGHT * 0.6,
1580 has_close_button => 1, 1626 has_close_button => 1,
1581 ; 1627 ;
1628
1629 $METASERVER = metaserver_dialog;
1582 1630
1583 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1631 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1584 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1632 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1585 1633
1586 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1634 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1596 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1644 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1597 . "with nothing set and the recording started. After doing the actions you " 1645 . "with nothing set and the recording started. After doing the actions you "
1598 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1646 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1599 . "After pressing the combo the binding will be saved automatically and the " 1647 . "After pressing the combo the binding will be saved automatically and the "
1600 . "binding editor closes"); 1648 . "binding editor closes");
1601 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1602 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1603 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1649 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1604 "Some debuggin' options. Do not ask."); 1650 "Some debuggin' options. Do not ask.");
1605 1651
1606 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1652 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1607 1653
… …
1611 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1657 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1612 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1658 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1613 1659
1614 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1660 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1615 1661
1616 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1617 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1662 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1619 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1663 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1620 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1621 1664
1622 $BUTTONBAR->add (new CFClient::UI::Button 1665 $BUTTONBAR->add (new CFClient::UI::Button
1623 text => "Save Config", 1666 text => "Save Config",
1624 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1667 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1625 on_activate => sub { 1668 on_activate => sub {
… …
1628 status "Configuration Saved"; 1671 status "Configuration Saved";
1629 0 1672 0
1630 }, 1673 },
1631 ); 1674 );
1632 1675
1633 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1676 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1634 tooltip => "View Documentation"); 1677 tooltip => "View Documentation");
1635 1678
1636 $BUTTONBAR->add (new CFClient::UI::Button 1679 $BUTTONBAR->add (new CFClient::UI::Button
1637 text => "Quit", 1680 text => "Quit",
1638 tooltip => "Terminates the program", 1681 tooltip => "Terminates the program",

Diff Legend

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