ubergames
/
gtkradiant
mirror of https://github.com/UberGames/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/freemancw/GtkRadiant

This commit is contained in:
Radegast 2013-03-27 17:08:29 +01:00
parent d00a881b24 0c2e14b3a1
commit af1bedcc40
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
radiant/gtkdlgs.cpp
View File

@ -2689,7 +2689,9 @@ void DoCommandListDlg(){
int loop = 1, ret = IDCANCEL;
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Mapped Commands" ) );
gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pParentWnd->m_pWidget ) );
gtk_window_set_position( GTK_WINDOW( dlg ), GTK_WIN_POS_CENTER_ON_PARENT );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Shortcut List" ) );
gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event",
GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",

16
radiant/mainframe.cpp
View File

@ -1561,7 +1561,7 @@ void MainFrame::create_main_menu( GtkWidget *window, GtkWidget *vbox ){
menu_tearoff( menu );
}
item = create_menu_item_with_mnemonic( menu, _( "Manual" ),
item = create_menu_item_with_mnemonic( menu, _( "GtkRadiant Manual" ),
GTK_SIGNAL_FUNC( HandleCommand ), ID_HELP );
gtk_widget_add_accelerator( item, "activate", accel, GDK_F1, (GdkModifierType)0, GTK_ACCEL_VISIBLE );
@ -1572,11 +1572,11 @@ void MainFrame::create_main_menu( GtkWidget *window, GtkWidget *vbox ){
// TTimo: this is in global.xlink now
//create_menu_item_with_mnemonic (menu, "Links",
// GTK_SIGNAL_FUNC (HandleCommand), ID_HELP_LINKS);
create_menu_item_with_mnemonic( menu, _( "Bug report" ),
create_menu_item_with_mnemonic( menu, _( "Report a Bug" ),
GTK_SIGNAL_FUNC( HandleCommand ), ID_HELP_BUGREPORT );
create_menu_item_with_mnemonic( menu, _( "Shortcuts list" ),
create_menu_item_with_mnemonic( menu, _( "View Shortcuts" ),
GTK_SIGNAL_FUNC( HandleCommand ), ID_HELP_COMMANDLIST );
create_menu_item_with_mnemonic( menu, _( "_About" ),
create_menu_item_with_mnemonic( menu, _( "_About GtkRadiant" ),
GTK_SIGNAL_FUNC( HandleCommand ), ID_HELP_ABOUT );
@ -6476,11 +6476,7 @@ void MainFrame::OnPluginsRefresh(){
// open the Q3Rad manual
void MainFrame::OnHelp(){
// at least on win32, g_strGameToolsPath + "Q3Rad_Manual/index.htm"
Str help;
help = g_strAppPath;
help += "Q3Rad_Manual/index.htm";
OpenURL( help.GetBuffer() );
OpenURL( "http://icculus.org/gtkradiant/documentation/q3radiant_manual/index.htm" );
}
// FIXME: we'll go towards a unified help thing soon
@ -6492,7 +6488,7 @@ void MainFrame::OnHelpLinks(){
}
void MainFrame::OnHelpBugreport(){
OpenURL( "http://www.qeradiant.com/faq/fom-serve/cache/138.html" );
OpenURL( "https://github.com/TTimo/GtkRadiant/issues" );
}
void MainFrame::OnHelpCommandlist(){

2
radiant/preferences.cpp
View File

@ -1526,6 +1526,8 @@ void PrefsDlg::BuildDialog(){
dialog = m_pWidget;
gtk_window_set_title( GTK_WINDOW( dialog ), _( "GtkRadiant Preferences" ) );
gtk_window_set_transient_for( GTK_WINDOW( dialog ), GTK_WINDOW( g_pParentWnd->m_pWidget ) );
gtk_window_set_position( GTK_WINDOW( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
gtk_widget_realize( dialog );
mainvbox = gtk_vbox_new( FALSE, 5 );