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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.37 by root, Mon May 5 16:19:19 2008 UTC vs.
Revision 1.42 by elmex, Thu May 8 18:25:25 2008 UTC

… …
664 # right: accept 664 # right: accept
665 $table->add_at (4, 0, new DC::UI::Button 665 $table->add_at (4, 0, new DC::UI::Button
666 text => "Accept", 666 text => "Accept",
667 on_activate => sub { 667 on_activate => sub {
668 $conn->send ("reply n"); 668 $conn->send ("reply n");
669 $STATS_PAGE->hide;
670 destroy_query_dialog $conn; 669 destroy_query_dialog $conn;
671 0 670 0
672 }, 671 },
673 ); 672 );
674 673
… …
1743 1742
1744 $r 1743 $r
1745} 1744}
1746 1745
1747my %SORT_ORDER = ( 1746my %SORT_ORDER = (
1748 type => undef, 1747 type => sub {
1748 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1749 },
1749 mtime => sub { 1750 mtime => sub {
1750 my $NOW = time; 1751 my $NOW = time;
1751 sort { 1752 sort {
1752 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1753 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1753 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1754 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
2242 force_h => $::HEIGHT * 0.6, 2243 force_h => $::HEIGHT * 0.6,
2243 has_close_button => 1, 2244 has_close_button => 1,
2244 ; 2245 ;
2245 2246
2246 $METASERVER = metaserver_dialog; 2247 $METASERVER = metaserver_dialog;
2248 # the name is changed to not conflict with the older name as users could have hidden it
2247 $MESSAGE_WINDOW = new DC::UI::Dockbar (title => 'Messages'); 2249 $MESSAGE_WINDOW = new DC::UI::Dockbar
2250 name => "message_window2",
2251 title => 'Messages',
2252 force_w => $::WIDTH * 0.6,
2253 force_h => $::HEIGHT * 0.25,
2254 ;
2255
2248 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2256 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2249 2257
2250 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2258 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2251 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2259 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2252 2260
2253 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2261 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2254 "Configure the server to play on, your username and password."); 2262 "Configure the server to play on, your username and password.");
2255 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2263 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2294 }, 2302 },
2295 ); 2303 );
2296 2304
2297 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2305 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2298 tooltip => "View Documentation"); 2306 tooltip => "View Documentation");
2299
2300 2307
2301 $BUTTONBAR->add (new DC::UI::Button 2308 $BUTTONBAR->add (new DC::UI::Button
2302 text => "Quit", 2309 text => "Quit",
2303 tooltip => "Terminates the program", 2310 tooltip => "Terminates the program",
2304 on_activate => sub { 2311 on_activate => sub {
… …
2475 pickup => 0, 2482 pickup => 0,
2476 inv_sort => "mtime", 2483 inv_sort => "mtime",
2477 default => "profile", # default profile 2484 default => "profile", # default profile
2478 show_tips => 1, 2485 show_tips => 1,
2479 logview_max_par => 1000, 2486 logview_max_par => 1000,
2487 shift_fire_stop => 0,
2480 ); 2488 );
2481 2489
2482 while (my ($k, $v) = each %DEF_CFG) { 2490 while (my ($k, $v) = each %DEF_CFG) {
2483 $CFG->{$k} = $v unless exists $CFG->{$k}; 2491 $CFG->{$k} = $v unless exists $CFG->{$k};
2484 } 2492 }

Diff Legend

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