From d13014ae0333f87b41904f68e0642db8d20858be Mon Sep 17 00:00:00 2001 From: mattn Date: Fri, 4 Jul 2008 22:11:30 +0000 Subject: [PATCH] * more translateable strings * fixed warning about unused variable git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk@292 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- contrib/bkgrnd2d/dialog.cpp | 32 ++-- contrib/camera/dialogs.cpp | 146 +++++++++--------- contrib/gtkgensurf/gendlgs.cpp | 117 +++++++------- contrib/prtview/gtkdlgs.cpp | 32 ++-- .../surfaceflagsdialog_ufoai.cpp | 3 +- radiant.pot | 145 ++++++++++++++++- radiant/findtexturedialog.cpp | 23 +-- radiant/gtkmisc.cpp | 18 +-- radiant/patchdialog.cpp | 45 +++--- radiant/surfacedialog.cpp | 109 ++++++------- 10 files changed, 404 insertions(+), 266 deletions(-) diff --git a/contrib/bkgrnd2d/dialog.cpp b/contrib/bkgrnd2d/dialog.cpp index d637c29c..3e7c862a 100644 --- a/contrib/bkgrnd2d/dialog.cpp +++ b/contrib/bkgrnd2d/dialog.cpp @@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "bkgrnd2d.h" #include "dialog.h" +#include // spaces to make label nice and big #define NO_FILE_MSG " (no file loaded) " @@ -146,7 +147,7 @@ void CBackgroundDialogPage::Browse() //TODO bug/patch for comments //TODO patern gets fucked up sometimes if empty newfile = g_FuncTable.m_pfnFileDialog(pDialogWnd,TRUE, - "Load Background Image",browsedir,FILETYPE_KEY); + _("Load Background Image"),browsedir,FILETYPE_KEY); if(!newfile) { Syn_Printf(MSG_PREFIX "newfile = NULL\n"); return; @@ -169,8 +170,7 @@ void CBackgroundDialogPage::Browse() void CBackgroundDialogPage::SetPosLabel() { char s[64]; - // TODO no snprintf ? - sprintf(s, "Size/Position (%d,%d) (%d,%d)",(int)(m_pImage->m_xmin), + snprintf(s, sizeof(s) - 1, _("Size/Position (%d,%d) (%d,%d)"),(int)(m_pImage->m_xmin), (int)(m_pImage->m_ymin),(int)(m_pImage->m_xmax),(int)(m_pImage->m_ymax)); gtk_label_set_text(GTK_LABEL(m_pPosLabel),s); } @@ -188,22 +188,22 @@ CBackgroundDialogPage::CBackgroundDialogPage(VIEWTYPE vt ) switch(m_vt) { case XY: - m_pTabLabel = gtk_label_new("X/Y"); + m_pTabLabel = gtk_label_new(_("X/Y")); m_pImage = &backgroundXY; break; case XZ: - m_pTabLabel = gtk_label_new("X/Z"); + m_pTabLabel = gtk_label_new(_("X/Z")); m_pImage = &backgroundXZ; break; case YZ: - m_pTabLabel = gtk_label_new("Y/Z"); + m_pTabLabel = gtk_label_new(_("Y/Z")); m_pImage = &backgroundYZ; break; } // A vbox to hold everything m_pWidget = gtk_vbox_new(FALSE,0); // Frame for file row - frame = gtk_frame_new("File"); + frame = gtk_frame_new(_("File")); gtk_box_pack_start (GTK_BOX (m_pWidget),frame, FALSE, FALSE, 2); // hbox for first row @@ -239,14 +239,14 @@ CBackgroundDialogPage::CBackgroundDialogPage(VIEWTYPE vt ) gtk_widget_show (frame); // second row (rendering options) - frame = gtk_frame_new("Rendering"); + frame = gtk_frame_new(_("Rendering")); gtk_box_pack_start (GTK_BOX (m_pWidget),frame, FALSE, FALSE, 2); hbox = gtk_hbox_new(FALSE,5); gtk_container_set_border_width(GTK_CONTAINER (hbox),4); gtk_container_add (GTK_CONTAINER (frame), hbox); - w = gtk_label_new("Vertex alpha:"); + w = gtk_label_new(_("Vertex alpha:")); gtk_box_pack_start (GTK_BOX (hbox),w, FALSE, FALSE, 5); gtk_widget_show (w); @@ -256,13 +256,13 @@ CBackgroundDialogPage::CBackgroundDialogPage(VIEWTYPE vt ) g_signal_connect (G_OBJECT (w), "value-changed", G_CALLBACK (alpha_adjust_callback), (gpointer)this); gtk_box_pack_start (GTK_BOX (hbox),w, TRUE, TRUE, 5); - gtk_tooltips_set_tip (pTooltips, w, "Set image transparancy", NULL); + gtk_tooltips_set_tip (pTooltips, w, _("Set image transparancy"), NULL); gtk_widget_show (w); gtk_widget_show (hbox); gtk_widget_show (frame); // Third row (size and position) - frame = gtk_frame_new("Size/Position (undefined)"); + frame = gtk_frame_new(_("Size/Position (undefined)")); m_pPosLabel = gtk_frame_get_label_widget (GTK_FRAME(frame)); gtk_box_pack_start ( GTK_BOX (m_pWidget), frame, FALSE, FALSE, 2); @@ -270,19 +270,19 @@ CBackgroundDialogPage::CBackgroundDialogPage(VIEWTYPE vt ) gtk_container_add (GTK_CONTAINER (frame), hbox); gtk_container_set_border_width(GTK_CONTAINER (hbox),4); - w = gtk_button_new_with_label ("from selection"); + w = gtk_button_new_with_label (_("from selection")); gtk_box_pack_start (GTK_BOX (hbox),w, TRUE, FALSE, 5); g_signal_connect (G_OBJECT (w), "clicked", G_CALLBACK (size_sel_callback), (gpointer)this); - gtk_tooltips_set_tip (pTooltips, w, "Set the size of the image to the bounding rectangle of all selected brushes and entities", NULL); + gtk_tooltips_set_tip (pTooltips, w, _("Set the size of the image to the bounding rectangle of all selected brushes and entities"), NULL); gtk_widget_show (w); if(m_vt == XY) { - w = gtk_button_new_with_label ("from map mins/maxs"); + w = gtk_button_new_with_label (_("from map mins/maxs")); gtk_box_pack_start ( GTK_BOX (hbox),w, TRUE, FALSE, 2); g_signal_connect (G_OBJECT (w), "clicked", G_CALLBACK (size_mm_callback), (gpointer)this); - gtk_tooltips_set_tip (pTooltips, w, "Set the size of the image using the mapcoordsmins and mapcoordsmaxs keys of the worldspawn entity", NULL); + gtk_tooltips_set_tip (pTooltips, w, _("Set the size of the image using the mapcoordsmins and mapcoordsmaxs keys of the worldspawn entity"), NULL); gtk_widget_show (w); } @@ -321,7 +321,7 @@ void InitBackgroundDialog() { CBackgroundDialogPage *pPage; - pDialogWnd = gtk_dialog_new_with_buttons ("Background Images", + pDialogWnd = gtk_dialog_new_with_buttons (_("Background Images"), GTK_WINDOW(g_pMainWidget), (GtkDialogFlags)(GTK_DIALOG_DESTROY_WITH_PARENT), // TODO dialog with no buttons diff --git a/contrib/camera/dialogs.cpp b/contrib/camera/dialogs.cpp index 866afd17..146fd7ca 100644 --- a/contrib/camera/dialogs.cpp +++ b/contrib/camera/dialogs.cpp @@ -93,7 +93,7 @@ static gint ci_new( GtkWidget *widget, gpointer data ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - frame = gtk_frame_new( "Type" ); + frame = gtk_frame_new( _("Type") ); gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 ); gtk_widget_show( frame ); @@ -156,7 +156,7 @@ static gint ci_new( GtkWidget *widget, gpointer data ) loop = 1; while (loop) gtk_main_iteration (); - + dialogError = FALSE; if( ret == IDOK ) { @@ -211,7 +211,7 @@ static gint ci_apply( GtkWidget *widget, gpointer data ) } str = gtk_entry_get_text( GTK_ENTRY(g_pSecondsEntry) ); - + if( str ) { GetCurrentCam()->GetCam()->setBaseTime( atof( str ) ); build = true; @@ -434,7 +434,7 @@ static gint ci_rename( GtkWidget *widget, gpointer data ) loop = 1; while (loop) gtk_main_iteration (); - + dialogError = FALSE; if( ret == IDOK ) { @@ -514,7 +514,7 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - frame = gtk_frame_new( "Type" ); + frame = gtk_frame_new( _("Type") ); gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 ); gtk_widget_show( frame ); @@ -525,17 +525,17 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ) // -------------------------- // - fixed = gtk_radio_button_new_with_label( targetTypeRadio, "Fixed" ); + fixed = gtk_radio_button_new_with_label( targetTypeRadio, _("Fixed") ); gtk_box_pack_start( GTK_BOX( vbox2 ), fixed, FALSE, FALSE, 3 ); gtk_widget_show( fixed ); targetTypeRadio = gtk_radio_button_group( GTK_RADIO_BUTTON( fixed ) ); - interpolated = gtk_radio_button_new_with_label( targetTypeRadio, "Interpolated" ); + interpolated = gtk_radio_button_new_with_label( targetTypeRadio, _("Interpolated") ); gtk_box_pack_start( GTK_BOX( vbox2 ), interpolated, FALSE, FALSE, 3 ); gtk_widget_show( interpolated ); targetTypeRadio = gtk_radio_button_group( GTK_RADIO_BUTTON( interpolated ) ); - spline = gtk_radio_button_new_with_label( targetTypeRadio, "Spline" ); + spline = gtk_radio_button_new_with_label( targetTypeRadio, _("Spline") ); gtk_box_pack_start( GTK_BOX( vbox2 ), spline, FALSE, FALSE, 3 ); gtk_widget_show( spline ); targetTypeRadio = gtk_radio_button_group( GTK_RADIO_BUTTON( spline ) ); @@ -552,7 +552,7 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - w = gtk_button_new_with_label ("Ok"); + w = gtk_button_new_with_label (_("Ok")); gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDOK)); gtk_widget_show (w); @@ -560,7 +560,7 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ) GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); gtk_widget_grab_default( w ); - w = gtk_button_new_with_label ("Cancel"); + w = gtk_button_new_with_label (_("Cancel")); gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDCANCEL)); gtk_widget_show (w); @@ -577,7 +577,7 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ) loop = 1; while (loop) gtk_main_iteration (); - + dialogError = FALSE; if( ret == IDOK ) { @@ -752,20 +752,20 @@ static gint ci_camlist_changed( GtkWidget *widget, gpointer data ) enum camEventType { EVENT_NA = 0x00, - EVENT_WAIT, // - EVENT_TARGETWAIT, // - EVENT_SPEED, // + EVENT_WAIT, // + EVENT_TARGETWAIT, // + EVENT_SPEED, // EVENT_TARGET, // char(name) - EVENT_SNAPTARGET, // + EVENT_SNAPTARGET, // EVENT_FOV, // int(time), int(targetfov) - EVENT_CMD, // - EVENT_TRIGGER, // - EVENT_STOP, // - EVENT_CAMERA, // + EVENT_CMD, // + EVENT_TRIGGER, // + EVENT_STOP, // + EVENT_CAMERA, // EVENT_FADEOUT, // int(time) EVENT_FADEIN, // int(time) - EVENT_FEATHER, // - EVENT_COUNT + EVENT_FEATHER, // + EVENT_COUNT }; // { requires parameters, enabled } @@ -787,20 +787,20 @@ const bool camEventFlags[][2] = { }; const char *camEventStr[] = { - "n/a", - "Wait", - "Target wait", - "Speed", - "Change Target ", - "Snap Target", - "FOV ", - "Run Script", - "Trigger", - "Stop", - "Change to Camera (or ", - "Fade Out ", - "Fade In ", - "Feather" + N_("n/a"), + N_("Wait"), + N_("Target wait"), + N_("Speed"), + N_("Change Target "), + N_("Snap Target"), + N_("FOV "), + N_("Run Script"), + N_("Trigger"), + N_("Stop"), + N_("Change to Camera (or "), + N_("Fade Out "), + N_("Fade In "), + N_("Feather") }; static gint ci_add( GtkWidget *widget, gpointer data ) @@ -816,7 +816,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ) // create the window window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_window_set_title( GTK_WINDOW (window), "Add Event" ); + gtk_window_set_title( GTK_WINDOW (window), _("Add Event") ); gtk_signal_connect( GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pCameraInspectorWnd ) ); @@ -837,7 +837,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - frame = gtk_frame_new( "Type" ); + frame = gtk_frame_new( _("Type") ); gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 ); gtk_widget_show( frame ); @@ -863,7 +863,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - w = gtk_label_new( "Parameters:" ); + w = gtk_label_new( _("Parameters:") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_widget_show( w ); @@ -883,7 +883,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - w = gtk_button_new_with_label ("Ok"); + w = gtk_button_new_with_label (_("Ok")); gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDOK)); gtk_widget_show (w); @@ -891,7 +891,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ) GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); gtk_widget_grab_default( w ); - w = gtk_button_new_with_label ("Cancel"); + w = gtk_button_new_with_label (_("Cancel")); gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDCANCEL)); gtk_widget_show (w); @@ -908,7 +908,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ) loop = 1; while (loop) gtk_main_iteration (); - + dialogError = FALSE; if( ret == IDOK ) { @@ -970,8 +970,8 @@ static gint ci_timeline_changed( GtkAdjustment *adjustment ) GetCurrentCam()->GetCam()->getCameraInfo( (long)(adjustment->value), &origin[0], &dir[0], &fov ); VectorSet( angles, asin (dir[2])*180/3.14159, atan2 (dir[1], dir[0])*180/3.14159, 0 ); - g_CameraTable.m_pfnSetCamera( origin, angles ); - } + g_CameraTable.m_pfnSetCamera( origin, angles ); + } return TRUE; } @@ -982,7 +982,7 @@ GtkWidget *CreateCameraInspectorDialog( void ) // create the window window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_window_set_title( GTK_WINDOW (window), "Camera Inspector" ); + gtk_window_set_title( GTK_WINDOW (window), _("Camera Inspector") ); gtk_signal_connect( GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC( ci_close ), NULL ); gtk_signal_connect( GTK_OBJECT (window), "expose_event", GTK_SIGNAL_FUNC( ci_expose ), NULL ); // gtk_signal_connect( GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -1018,7 +1018,7 @@ GtkWidget *CreateCameraInspectorDialog( void ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - w = gtk_label_new( "File:" ); + w = gtk_label_new( _("File:") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_widget_show( w ); @@ -1032,15 +1032,15 @@ GtkWidget *CreateCameraInspectorDialog( void ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - w = gtk_label_new( "Name:" ); + w = gtk_label_new( _("Name:") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_widget_show( w ); g_pCamName = gtk_entry_new(); gtk_box_pack_start( GTK_BOX( hbox ), g_pCamName, FALSE, FALSE, 0 ); - gtk_widget_show( g_pCamName ); + gtk_widget_show( g_pCamName ); - w = gtk_label_new( "Type: " ); + w = gtk_label_new( _("Type:") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_widget_show( w ); @@ -1056,7 +1056,7 @@ GtkWidget *CreateCameraInspectorDialog( void ) // -------------------------- // - frame = gtk_frame_new( "Path and Target editing" ); + frame = gtk_frame_new( _("Path and Target editing") ); gtk_widget_show( frame ); gtk_table_attach( GTK_TABLE( table ), frame, 0, 1, 1, 2, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), @@ -1073,7 +1073,7 @@ GtkWidget *CreateCameraInspectorDialog( void ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - w = gtk_label_new( "Edit:" ); + w = gtk_label_new( _("Edit:") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_widget_show( w ); @@ -1092,14 +1092,14 @@ GtkWidget *CreateCameraInspectorDialog( void ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - g_pEditModeEditRadioButton = gtk_radio_button_new_with_label( g_pEditTypeRadio, "Edit Points" ); + g_pEditModeEditRadioButton = gtk_radio_button_new_with_label( g_pEditTypeRadio, _("Edit Points") ); gtk_box_pack_start( GTK_BOX( hbox ), g_pEditModeEditRadioButton, FALSE, FALSE, 3 ); gtk_widget_show( g_pEditModeEditRadioButton ); g_pEditTypeRadio = gtk_radio_button_group( GTK_RADIO_BUTTON( g_pEditModeEditRadioButton ) ); gtk_signal_connect( GTK_OBJECT( g_pEditModeEditRadioButton ), "clicked", GTK_SIGNAL_FUNC( ci_editmode_edit ), NULL ); - g_pEditModeAddRadioButton = gtk_radio_button_new_with_label( g_pEditTypeRadio, "Add Points" ); + g_pEditModeAddRadioButton = gtk_radio_button_new_with_label( g_pEditTypeRadio, _("Add Points") ); gtk_box_pack_start( GTK_BOX( hbox ), g_pEditModeAddRadioButton, FALSE, FALSE, 3 ); gtk_widget_show( g_pEditModeAddRadioButton ); g_pEditTypeRadio = gtk_radio_button_group( GTK_RADIO_BUTTON( g_pEditModeAddRadioButton ) ); @@ -1112,7 +1112,7 @@ GtkWidget *CreateCameraInspectorDialog( void ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(g_pEditModeAddRadioButton), TRUE ); } - w = gtk_label_new( "Type: " ); + w = gtk_label_new( _("Type:") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_widget_show( w ); @@ -1127,12 +1127,12 @@ GtkWidget *CreateCameraInspectorDialog( void ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - w = gtk_button_new_with_label( "Rename..." ); + w = gtk_button_new_with_label( _("Rename...") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, TRUE, 0); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_rename ), NULL ); gtk_widget_show( w ); - w = gtk_button_new_with_label( "Add Target..." ); + w = gtk_button_new_with_label( _("Add Target...") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, TRUE, 0); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_add_target ), NULL ); gtk_widget_show( w ); @@ -1150,7 +1150,7 @@ GtkWidget *CreateCameraInspectorDialog( void ) // -------------------------- // - frame = gtk_frame_new( "Time" ); + frame = gtk_frame_new( _("Time") ); gtk_widget_show( frame ); gtk_table_attach( GTK_TABLE( table ), frame, 0, 1, 2, 3, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), @@ -1167,7 +1167,7 @@ GtkWidget *CreateCameraInspectorDialog( void ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - w = gtk_label_new( "Length (seconds):" ); + w = gtk_label_new( _("Length (seconds):") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_widget_show( w ); @@ -1181,20 +1181,20 @@ GtkWidget *CreateCameraInspectorDialog( void ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - w = gtk_label_new( "Current Time: " ); + w = gtk_label_new( _("Current Time:") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_widget_show( w ); - w = gtk_label_new( "0.00" ); + w = gtk_label_new( _("0.00") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_widget_show( w ); g_pCurrentTime = GTK_LABEL( w ); - w = gtk_label_new( " of " ); + w = gtk_label_new( _(" of ") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_widget_show( w ); - w = gtk_label_new( "0.00" ); + w = gtk_label_new( _("0.00") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_widget_show( w ); g_pTotalTime = GTK_LABEL( w ); @@ -1218,7 +1218,7 @@ GtkWidget *CreateCameraInspectorDialog( void ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - g_pTrackCamera = gtk_check_button_new_with_label( "Track Camera" ); + g_pTrackCamera = gtk_check_button_new_with_label( _("Track Camera") ); gtk_box_pack_start( GTK_BOX( hbox ), g_pTrackCamera, FALSE, FALSE, 0 ); gtk_widget_show( g_pTrackCamera ); @@ -1228,7 +1228,7 @@ GtkWidget *CreateCameraInspectorDialog( void ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_widget_show( hbox ); - w = gtk_label_new( "Events:" ); + w = gtk_label_new( _("Events:") ); gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); gtk_widget_show( w ); @@ -1258,12 +1258,12 @@ GtkWidget *CreateCameraInspectorDialog( void ) gtk_box_pack_start( GTK_BOX( hbox ), vbox, FALSE, FALSE, 0 ); gtk_widget_show( vbox ); - w = gtk_button_new_with_label( "Add..." ); + w = gtk_button_new_with_label( _("Add...") ); gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_add ), NULL ); gtk_widget_show( w ); - w = gtk_button_new_with_label( "Del" ); + w = gtk_button_new_with_label( _("Del") ); gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_del ), NULL ); gtk_widget_show( w ); @@ -1285,12 +1285,12 @@ GtkWidget *CreateCameraInspectorDialog( void ) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0 ); - w = gtk_button_new_with_label( "New..." ); + w = gtk_button_new_with_label( _("New...") ); gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_new ), NULL ); gtk_widget_show( w ); - w = gtk_button_new_with_label( "Load..." ); + w = gtk_button_new_with_label( _("Load...") ); gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_load ), NULL ); gtk_widget_show( w ); @@ -1303,26 +1303,26 @@ GtkWidget *CreateCameraInspectorDialog( void ) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0 ); - w = gtk_button_new_with_label( "Save..." ); + w = gtk_button_new_with_label( _("Save...") ); gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_save ), NULL ); gtk_widget_show( w ); - w = gtk_button_new_with_label( "Unload" ); + w = gtk_button_new_with_label( _("Unload") ); gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_unload ), NULL ); gtk_widget_show( w ); - + hbox = gtk_hbox_new( FALSE, 5 ); gtk_box_pack_start( GTK_BOX( vbox ), hbox, TRUE, TRUE, 0 ); gtk_widget_show( hbox ); - w = gtk_button_new_with_label( "Apply" ); + w = gtk_button_new_with_label( _("Apply") ); gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_apply ), NULL ); gtk_widget_show( w ); - w = gtk_button_new_with_label( "Preview" ); + w = gtk_button_new_with_label( _("Preview") ); gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_preview ), NULL ); gtk_widget_show( w ); @@ -1339,7 +1339,7 @@ GtkWidget *CreateCameraInspectorDialog( void ) gtk_box_pack_start( GTK_BOX( vbox ), hbox, TRUE, TRUE, 0 ); gtk_widget_show( hbox ); - w = gtk_button_new_with_label( "Close" ); + w = gtk_button_new_with_label( _("Close") ); gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_close ), NULL ); GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); diff --git a/contrib/gtkgensurf/gendlgs.cpp b/contrib/gtkgensurf/gendlgs.cpp index 9297ea2c..372b833f 100644 --- a/contrib/gtkgensurf/gendlgs.cpp +++ b/contrib/gtkgensurf/gendlgs.cpp @@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #include #include "gensurf.h" +#include #define GENERAL_TAB 0 #define EXTENTS_TAB 1 @@ -265,7 +266,6 @@ static void SetDlgValues (int tab) { char Text[256]; char RForm[16] = "%.5g"; - int i; switch (tab) { @@ -277,6 +277,7 @@ static void SetDlgValues (int tab) // than once anyhow. if (!FirstPassComplete) { + int i; for (i = 0; i < NUMGAMES; i++) gtk_widget_set_sensitive (game_radios[i], (i == Game ? TRUE : FALSE)); for (i = 0; i < 6; i++) @@ -1423,11 +1424,11 @@ GtkWidget* create_main_dialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - label = gtk_label_new ("General"); + label = gtk_label_new (_("General")); gtk_widget_show (label); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), table, label); - frame = gtk_frame_new ("Game"); + frame = gtk_frame_new (_("Game")); gtk_widget_show (frame); gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 0, 1, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), @@ -1448,7 +1449,7 @@ GtkWidget* create_main_dialog () g_signal_connect (G_OBJECT (radio), "toggled", G_CALLBACK (general_game), GINT_TO_POINTER (i)); } - frame = gtk_frame_new ("Waveform"); + frame = gtk_frame_new (_("Waveform")); gtk_widget_show (frame); gtk_table_attach (GTK_TABLE (table), frame, 1, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), @@ -1469,7 +1470,7 @@ GtkWidget* create_main_dialog () g_signal_connect (G_OBJECT (radio), "toggled", G_CALLBACK (general_wave), GINT_TO_POINTER (i)); } - frame = gtk_frame_new ("Orientation"); + frame = gtk_frame_new (_("Orientation")); gtk_widget_show (frame); gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 1, 2, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), @@ -1498,7 +1499,7 @@ GtkWidget* create_main_dialog () (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0); - label = gtk_label_new ("Wavelength:"); + label = gtk_label_new (_("Wavelength:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table2), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), @@ -1506,7 +1507,7 @@ GtkWidget* create_main_dialog () gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT); - label = gtk_label_new ("Max. amplitude:"); + label = gtk_label_new (_("Max. amplitude:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table2), label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), @@ -1514,7 +1515,7 @@ GtkWidget* create_main_dialog () gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT); - label = gtk_label_new ("Roughness:"); + label = gtk_label_new (_("Roughness:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table2), label, 0, 1, 2, 3, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), @@ -1522,7 +1523,7 @@ GtkWidget* create_main_dialog () gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT); - label = gtk_label_new ("Random seed:"); + label = gtk_label_new (_("Random seed:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table2), label, 0, 1, 3, 4, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), @@ -1571,7 +1572,7 @@ GtkWidget* create_main_dialog () gtk_widget_show (vbox); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - label = gtk_label_new ("Extents"); + label = gtk_label_new (_("Extents")); gtk_widget_show (label); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label); @@ -1579,7 +1580,7 @@ GtkWidget* create_main_dialog () gtk_widget_show (hbox2); gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, TRUE, 0); - frame = gtk_frame_new ("Extents"); + frame = gtk_frame_new (_("Extents")); gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (hbox2), frame, TRUE, TRUE, 0); @@ -1590,41 +1591,41 @@ GtkWidget* create_main_dialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - label = gtk_label_new ("X:"); + label = gtk_label_new (_("X:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); g_object_set_data (G_OBJECT (dlg), "hmin_text", label); - label = gtk_label_new ("X:"); + label = gtk_label_new (_("X:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); g_object_set_data (G_OBJECT (dlg), "hmax_text", label); - label = gtk_label_new ("Y:"); + label = gtk_label_new (_("Y:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); g_object_set_data (G_OBJECT (dlg), "vmin_text", label); - label = gtk_label_new ("Y:"); + label = gtk_label_new (_("Y:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); g_object_set_data (G_OBJECT (dlg), "vmax_text", label); - label = gtk_label_new ("Lower-left"); + label = gtk_label_new (_("Lower-left")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - label = gtk_label_new ("Upper-right"); + label = gtk_label_new (_("Upper-right")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 3, 4, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -1666,7 +1667,7 @@ GtkWidget* create_main_dialog () g_object_set_data (G_OBJECT (dlg), "vmax", entry); g_signal_connect (G_OBJECT (entry), "focus_out_event", G_CALLBACK (doublevariable_entryfocusout), &Vur); - frame = gtk_frame_new ("Divisions"); + frame = gtk_frame_new (_("Divisions")); gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (hbox2), frame, TRUE, TRUE, 0); @@ -1677,14 +1678,14 @@ GtkWidget* create_main_dialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - label = gtk_label_new ("X:"); + label = gtk_label_new (_("X:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0); g_object_set_data (G_OBJECT (dlg), "nh_text", label); - label = gtk_label_new ("Y:"); + label = gtk_label_new (_("Y:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -1718,7 +1719,7 @@ GtkWidget* create_main_dialog () g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (extents_use_patches), NULL); // ^Fishman - Snap to grid, replaced scroll bar with a texbox. - label = gtk_label_new ("Snap to grid:"); + label = gtk_label_new (_("Snap to grid:")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0); gtk_object_set_data (GTK_OBJECT (dlg), "snap_text", label); @@ -1736,7 +1737,7 @@ GtkWidget* create_main_dialog () gtk_widget_show (hbox2); gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, TRUE, 10); - label = gtk_label_new ("Decimate:"); + label = gtk_label_new (_("Decimate:")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 0); @@ -1750,7 +1751,7 @@ GtkWidget* create_main_dialog () gtk_scale_set_digits (GTK_SCALE (scale), 0); g_object_set_data (G_OBJECT (dlg), "decimate", scale); - frame = gtk_frame_new ("Corner values"); + frame = gtk_frame_new (_("Corner values")); gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0); @@ -1761,25 +1762,25 @@ GtkWidget* create_main_dialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - label = gtk_label_new ("Upper-left:"); + label = gtk_label_new (_("Upper-left:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - label = gtk_label_new ("Lower-left:"); + label = gtk_label_new (_("Lower-left:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - label = gtk_label_new ("Upper-right:"); + label = gtk_label_new (_("Upper-right:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - label = gtk_label_new ("Lower-right:"); + label = gtk_label_new (_("Lower-right:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -1833,7 +1834,7 @@ GtkWidget* create_main_dialog () gtk_widget_show (vbox); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - label = gtk_label_new ("Bitmap"); + label = gtk_label_new (_("Bitmap")); gtk_widget_show (label); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label); @@ -1849,7 +1850,7 @@ GtkWidget* create_main_dialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - label = gtk_label_new ("Filename:"); + label = gtk_label_new (_("Filename:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -1870,14 +1871,14 @@ GtkWidget* create_main_dialog () (GtkAttachOptions) (0), (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0); - button = gtk_button_new_with_label ("Browse..."); + button = gtk_button_new_with_label (_("Browse...")); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); gtk_widget_set_usize (button, 60, -2); g_object_set_data (G_OBJECT (dlg), "bmp_file_browse", button); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (bitmap_browse), NULL); - button = gtk_button_new_with_label ("Reload"); + button = gtk_button_new_with_label (_("Reload")); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); gtk_widget_set_usize (button, 60, -2); @@ -1891,7 +1892,7 @@ GtkWidget* create_main_dialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - label = gtk_label_new ("Map color 0 to:"); + label = gtk_label_new (_("Map color 0 to:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), @@ -1900,7 +1901,7 @@ GtkWidget* create_main_dialog () gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT); - label = gtk_label_new ("Map color 255 to:"); + label = gtk_label_new (_("Map color 255 to:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), @@ -1939,16 +1940,16 @@ GtkWidget* create_main_dialog () gtk_widget_show (vbox); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - label = gtk_label_new ("Fix Points"); + label = gtk_label_new (_("Fix Points")); gtk_widget_show (label); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label); - label = gtk_label_new ("Click on a vertex in the lower half of the preview window,\n" + label = gtk_label_new (_("Click on a vertex in the lower half of the preview window,\n" "then use the arrow keys or text box to assign a value.\n" "Use Ctrl+Click to select multiple vertices/toggle a\n" "selection. Use Shift+Click to select a range of vertices.\n\n" "Click \"Free\" to unlock a vertex. Vertices within \"Range\n" - "affected\" will be influenced by this vertex."); + "affected\" will be influenced by this vertex.")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0); @@ -1959,7 +1960,7 @@ GtkWidget* create_main_dialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - label = gtk_label_new ("Value:"); + label = gtk_label_new (_("Value:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -1967,7 +1968,7 @@ GtkWidget* create_main_dialog () gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); g_object_set_data (G_OBJECT (dlg), "fix_value_text", label); - label = gtk_label_new ("Range affected:"); + label = gtk_label_new (_("Range affected:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -1975,7 +1976,7 @@ GtkWidget* create_main_dialog () gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); g_object_set_data (G_OBJECT (dlg), "fix_range_text", label); - label = gtk_label_new ("Rate of change:"); + label = gtk_label_new (_("Rate of change:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -2012,7 +2013,7 @@ GtkWidget* create_main_dialog () g_object_set_data (G_OBJECT (dlg), "fix_rate", entry); g_signal_connect (G_OBJECT (entry), "focus_out_event", G_CALLBACK (fix_rate_entryfocusout), NULL); - button = gtk_button_new_with_label ("Free"); + button = gtk_button_new_with_label (_("Free")); gtk_widget_show (button); gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1, (GtkAttachOptions) (GTK_EXPAND), @@ -2021,7 +2022,7 @@ GtkWidget* create_main_dialog () g_object_set_data (G_OBJECT (dlg), "fix_free", button); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (fix_free), NULL); - button = gtk_button_new_with_label ("Free All"); + button = gtk_button_new_with_label (_("Free All")); gtk_widget_show (button); gtk_table_attach (GTK_TABLE (table), button, 2, 3, 1, 2, (GtkAttachOptions) (GTK_EXPAND), @@ -2034,7 +2035,7 @@ GtkWidget* create_main_dialog () gtk_widget_show (vbox); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - label = gtk_label_new ("Texture"); + label = gtk_label_new (_("Texture")); gtk_widget_show (label); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label); @@ -2045,21 +2046,21 @@ GtkWidget* create_main_dialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - label = gtk_label_new ("Surface:"); + label = gtk_label_new (_("Surface:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); - label = gtk_label_new ("Other:"); + label = gtk_label_new (_("Other:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); - label = gtk_label_new ("Steep:"); + label = gtk_label_new (_("Steep:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -2096,7 +2097,7 @@ GtkWidget* create_main_dialog () gtk_widget_show (hbox2); gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, TRUE, 0); - label = gtk_label_new ("\"Steep\" angle:"); + label = gtk_label_new (_("\"Steep\" angle:")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 0); @@ -2112,13 +2113,13 @@ GtkWidget* create_main_dialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - label = gtk_label_new ("Offset "); + label = gtk_label_new (_("Offset ")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - label = gtk_label_new ("Scale "); + label = gtk_label_new (_("Scale ")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 4, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -2158,20 +2159,20 @@ GtkWidget* create_main_dialog () - check = gtk_check_button_new_with_label ("Use detail brushes"); + check = gtk_check_button_new_with_label (_("Use detail brushes")); gtk_widget_show (check); gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, TRUE, 0); g_object_set_data (G_OBJECT (dlg), "detail", check); g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (texture_detail), NULL); - check = gtk_check_button_new_with_label ("Detail hint brushes"); + check = gtk_check_button_new_with_label (_("Detail hint brushes")); gtk_widget_show (check); gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, TRUE, 0); g_object_set_data (G_OBJECT (dlg), "hint", check); g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (texture_hint), NULL); // ^Fishman - Add terrain key to func_group. - check = gtk_check_button_new_with_label ("Add terrain key"); + check = gtk_check_button_new_with_label (_("Add terrain key")); gtk_widget_show (check); gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, TRUE, 0); g_object_set_data (G_OBJECT (dlg), "terrain_ent", check); @@ -2181,14 +2182,14 @@ GtkWidget* create_main_dialog () gtk_widget_show (vbox); gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, TRUE, 0); - button = gtk_button_new_with_label ("OK"); + button = gtk_button_new_with_label (_("OK")); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0); gtk_widget_set_usize (button, 60, -2); g_object_set_data (G_OBJECT (dlg), "go", button); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (main_go), NULL); - label = gtk_label_new ("Settings:"); + label = gtk_label_new (_("Settings:")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0); @@ -2198,31 +2199,31 @@ GtkWidget* create_main_dialog () g_object_set_data (G_OBJECT (dlg), "open", button); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (main_open), NULL); - button = gtk_button_new_with_label ("Save as..."); + button = gtk_button_new_with_label (_("Save as...")); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0); g_object_set_data (G_OBJECT (dlg), "save", button); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (main_save), NULL); - button = gtk_button_new_with_label ("Defaults"); + button = gtk_button_new_with_label (_("Defaults")); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0); g_object_set_data (G_OBJECT (dlg), "defaults", button); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (main_defaults), NULL); - button = gtk_button_new_with_label ("About..."); + button = gtk_button_new_with_label (_("About...")); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (main_about), NULL); - check = gtk_check_button_new_with_label ("Preview"); + check = gtk_check_button_new_with_label (_("Preview")); gtk_widget_show (check); gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, TRUE, 0); g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (main_preview), NULL); g_object_set_data (G_OBJECT (dlg), "main_preview", check); // ^Fishman - Antializing for the preview window. - check = gtk_check_button_new_with_label ("Antialised lines"); + check = gtk_check_button_new_with_label (_("Antialised lines")); gtk_widget_show (check); gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, TRUE, 0); g_object_set_data (G_OBJECT (dlg), "main_antialiasing", check); diff --git a/contrib/prtview/gtkdlgs.cpp b/contrib/prtview/gtkdlgs.cpp index f33c79b2..2de52c06 100644 --- a/contrib/prtview/gtkdlgs.cpp +++ b/contrib/prtview/gtkdlgs.cpp @@ -56,11 +56,11 @@ static void file_sel_callback (GtkWidget *widget, gpointer data) GtkWidget *parent; int *loop; char **filename; - + parent = gtk_widget_get_toplevel (widget); loop = (int*)g_object_get_data (G_OBJECT (parent), "loop"); filename = (char**)g_object_get_data (G_OBJECT (parent), "filename"); - + *loop = 0; if ((int)data == IDOK) *filename = g_strdup (gtk_file_selection_get_filename (GTK_FILE_SELECTION (parent))); @@ -482,7 +482,7 @@ void DoConfigDialog () GtkObject *adj; dlg = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (dlg), "Portal Viewer Configuration"); + gtk_window_set_title (GTK_WINDOW (dlg), _("Portal Viewer Configuration")); gtk_signal_connect (GTK_OBJECT (dlg), "delete_event", GTK_SIGNAL_FUNC (dialog_delete_callback), NULL); gtk_signal_connect (GTK_OBJECT (dlg), "destroy", @@ -495,7 +495,7 @@ void DoConfigDialog () gtk_container_add (GTK_CONTAINER (dlg), vbox); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - frame = gtk_frame_new ("3D View"); + frame = gtk_frame_new (_("3D View")); gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); @@ -525,42 +525,42 @@ void DoConfigDialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - button = gtk_button_new_with_label ("Color"); + button = gtk_button_new_with_label (_("Color")); gtk_widget_show (button); gtk_table_attach (GTK_TABLE (table), button, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnColor3d), NULL); - button = gtk_button_new_with_label ("Depth Color"); + button = gtk_button_new_with_label (_("Depth Color")); gtk_widget_show (button); gtk_table_attach (GTK_TABLE (table), button, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnColorFog), NULL); - aa3check = gtk_check_button_new_with_label ("Anti-Alias (May not work on some video cards)"); + aa3check = gtk_check_button_new_with_label (_("Anti-Alias (May not work on some video cards)")); gtk_widget_show (aa3check); gtk_table_attach (GTK_TABLE (table), aa3check, 1, 4, 0, 1, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_signal_connect (GTK_OBJECT (aa3check), "toggled", GTK_SIGNAL_FUNC (OnAntiAlias3d), NULL); - depthcheck = gtk_check_button_new_with_label ("Depth Cue"); + depthcheck = gtk_check_button_new_with_label (_("Depth Cue")); gtk_widget_show (depthcheck); gtk_table_attach (GTK_TABLE (table), depthcheck, 1, 2, 1, 2, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_signal_connect (GTK_OBJECT (depthcheck), "toggled", GTK_SIGNAL_FUNC (OnFog), NULL); - linescheck = gtk_check_button_new_with_label ("Lines"); + linescheck = gtk_check_button_new_with_label (_("Lines")); gtk_widget_show (linescheck); gtk_table_attach (GTK_TABLE (table), linescheck, 2, 3, 1, 2, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_signal_connect (GTK_OBJECT (linescheck), "toggled", GTK_SIGNAL_FUNC (OnLines), NULL); - polyscheck = gtk_check_button_new_with_label ("Polygons"); + polyscheck = gtk_check_button_new_with_label (_("Polygons")); gtk_widget_show (polyscheck); gtk_table_attach (GTK_TABLE (table), polyscheck, 3, 4, 1, 2, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), @@ -575,19 +575,19 @@ void DoConfigDialog () gtk_widget_show (menu); gtk_option_menu_set_menu (GTK_OPTION_MENU (zlist), menu); - item = gtk_menu_item_new_with_label ("Z-Buffer Test and Write (recommended for solid or no polygons)"); + item = gtk_menu_item_new_with_label (_("Z-Buffer Test and Write (recommended for solid or no polygons)")); gtk_widget_show (item); gtk_signal_connect (GTK_OBJECT (item), "activate", GTK_SIGNAL_FUNC (OnSelchangeZbuffer), GINT_TO_POINTER (0)); gtk_menu_append (GTK_MENU (menu), item); - item = gtk_menu_item_new_with_label ("Z-Buffer Test Only (recommended for transparent polygons)"); + item = gtk_menu_item_new_with_label (_("Z-Buffer Test Only (recommended for transparent polygons)")); gtk_widget_show (item); gtk_signal_connect (GTK_OBJECT (item), "activate", GTK_SIGNAL_FUNC (OnSelchangeZbuffer), GINT_TO_POINTER (1)); gtk_menu_append (GTK_MENU (menu), item); - item = gtk_menu_item_new_with_label ("Z-Buffer Off"); + item = gtk_menu_item_new_with_label (_("Z-Buffer Off")); gtk_widget_show (item); gtk_signal_connect (GTK_OBJECT (item), "activate", GTK_SIGNAL_FUNC (OnSelchangeZbuffer), GINT_TO_POINTER (2)); @@ -635,17 +635,17 @@ void DoConfigDialog () gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, FALSE, 0); - show3check = gtk_check_button_new_with_label ("Show"); + show3check = gtk_check_button_new_with_label (_("Show")); gtk_widget_show (show3check); gtk_box_pack_start (GTK_BOX (hbox), show3check, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (show3check), "toggled", GTK_SIGNAL_FUNC (OnConfig3d), NULL); - portalcheck = gtk_check_button_new_with_label ("Portal cubic clipper"); + portalcheck = gtk_check_button_new_with_label (_("Portal cubic clipper")); gtk_widget_show (portalcheck); gtk_box_pack_start (GTK_BOX (hbox), portalcheck, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (portalcheck), "toggled", GTK_SIGNAL_FUNC (OnClip), NULL); - frame = gtk_frame_new ("2D View"); + frame = gtk_frame_new (_("2D View")); gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); diff --git a/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp b/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp index e950ca3a..6049ea46 100644 --- a/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp +++ b/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp @@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #include "surfdlg_plugin.h" @@ -291,7 +292,7 @@ GtkWidget* Create_UFOAIFlagsDialog (GtkWidget* surfacedialog_widget) const char *buttonLabel; char buffer[8]; - frame1 = gtk_frame_new ("Flags"); + frame1 = gtk_frame_new (_("Flags")); gtk_widget_show (frame1); gtk_container_add (GTK_CONTAINER (surfacedialog_widget), frame1); diff --git a/radiant.pot b/radiant.pot index 8fe8d152..d43b3813 100644 --- a/radiant.pot +++ b/radiant.pot @@ -447,6 +447,7 @@ msgid "Patches" msgstr "" #: radiant/mainframe.cpp:1108 radiant/mainframe.cpp:1103 +#: radiant/patchdialog.cpp:333 msgid "Details" msgstr "" @@ -560,6 +561,7 @@ msgid "Flip _Z" msgstr "" #: radiant/mainframe.cpp:1180 radiant/mainframe.cpp:1175 +#: radiant/surfacedialog.cpp:715 msgid "Rotate" msgstr "" @@ -1477,7 +1479,7 @@ msgstr "" #: radiant/gtkdlgs.cpp:3371 radiant/gtkdlgs.cpp:3476 radiant/gtkdlgs.cpp:3547 #: radiant/gtkdlgs.cpp:3641 radiant/gtkdlgs.cpp:4006 #: radiant/preferences.cpp:1136 radiant/preferences.cpp:1554 -#: radiant/preferences.cpp:3296 +#: radiant/preferences.cpp:3296 radiant/findtexturedialog.cpp:223 msgid "OK" msgstr "" @@ -1495,6 +1497,8 @@ msgstr "" #: radiant/gtkdlgs.cpp:3483 radiant/gtkdlgs.cpp:3554 radiant/gtkdlgs.cpp:3648 #: radiant/gtkdlgs.cpp:4015 radiant/preferences.cpp:1141 #: radiant/preferences.cpp:1560 radiant/preferences.cpp:3301 +#: radiant/gtkmisc.cpp:949 radiant/gtkmisc.cpp:973 +#: radiant/surfacedialog.cpp:882 msgid "Cancel" msgstr "" @@ -1664,12 +1668,14 @@ msgid "Use paint-select in camera view:" msgstr "" #: radiant/preferences.cpp:1860 radiant/preferences.cpp:1861 -#: radiant/preferences.cpp:1872 +#: radiant/preferences.cpp:1872 radiant/gtkmisc.cpp:967 +#: radiant/gtkmisc.cpp:990 msgid "No" msgstr "" #: radiant/preferences.cpp:1861 radiant/preferences.cpp:1862 -#: radiant/preferences.cpp:1873 +#: radiant/preferences.cpp:1873 radiant/gtkmisc.cpp:959 +#: radiant/gtkmisc.cpp:982 msgid "Yes" msgstr "" @@ -2048,7 +2054,7 @@ msgstr "" #: radiant/preferences.cpp:3243 radiant/gtkdlgs.cpp:3536 #: radiant/preferences.cpp:3244 radiant/gtkdlgs.cpp:3535 -#: radiant/preferences.cpp:3257 +#: radiant/preferences.cpp:3257 radiant/patchdialog.cpp:464 msgid "Name:" msgstr "" @@ -2115,7 +2121,7 @@ msgstr "" #: radiant/gtkdlgs.cpp:1388 radiant/gtkdlgs.cpp:1736 radiant/gtkdlgs.cpp:2901 #: radiant/gtkdlgs.cpp:2996 radiant/gtkdlgs.cpp:3288 radiant/gtkdlgs.cpp:3824 #: radiant/gtkdlgs.cpp:2900 radiant/gtkdlgs.cpp:2995 radiant/gtkdlgs.cpp:3287 -#: radiant/gtkdlgs.cpp:3821 +#: radiant/gtkdlgs.cpp:3821 radiant/findtexturedialog.cpp:237 msgid "Close" msgstr "" @@ -2347,7 +2353,8 @@ msgstr "" msgid " Z " msgstr "" -#: radiant/gtkdlgs.cpp:1875 +#: radiant/gtkdlgs.cpp:1875 radiant/findtexturedialog.cpp:230 +#: radiant/patchdialog.cpp:658 radiant/surfacedialog.cpp:875 msgid "Apply" msgstr "" @@ -2433,14 +2440,17 @@ msgid "Scale" msgstr "" #: radiant/gtkdlgs.cpp:2416 radiant/gtkdlgs.cpp:2415 +#: radiant/patchdialog.cpp:390 msgid "X:" msgstr "" #: radiant/gtkdlgs.cpp:2423 radiant/gtkdlgs.cpp:2422 +#: radiant/patchdialog.cpp:396 msgid "Y:" msgstr "" #: radiant/gtkdlgs.cpp:2430 radiant/gtkdlgs.cpp:2429 +#: radiant/patchdialog.cpp:402 msgid "Z:" msgstr "" @@ -2538,3 +2548,126 @@ msgstr "" #: radiant/xywindow.cpp:133 msgid "Save BMP Image" msgstr "" + +#: radiant/findtexturedialog.cpp:216 +msgid "Find" +msgstr "" + +#: radiant/gtkmisc.cpp:927 radiant/gtkmisc.cpp:940 +msgid "Ok" +msgstr "" + +#: radiant/gtkmisc.cpp:1000 +msgid "Go to URL" +msgstr "" + +#: radiant/patchdialog.cpp:317 +msgid "Patch Properties" +msgstr "" + +#: radiant/patchdialog.cpp:348 +msgid "Row:" +msgstr "" + +#: radiant/patchdialog.cpp:354 +msgid "Column:" +msgstr "" + +#: radiant/patchdialog.cpp:408 +msgid "S:" +msgstr "" + +#: radiant/patchdialog.cpp:414 +msgid "T:" +msgstr "" + +#: radiant/patchdialog.cpp:455 radiant/surfacedialog.cpp:759 +msgid "Texturing" +msgstr "" + +#: radiant/patchdialog.cpp:482 +msgid "Horizontal Shift Step" +msgstr "" + +#: radiant/patchdialog.cpp:489 +msgid "Vertical Shift Step" +msgstr "" + +#: radiant/patchdialog.cpp:496 +msgid "Horizontal Stretch Step" +msgstr "" + +#: radiant/patchdialog.cpp:503 +msgid "Vertical Stretch Step" +msgstr "" + +#: radiant/patchdialog.cpp:510 +msgid "Rotate Step" +msgstr "" + +#: radiant/patchdialog.cpp:624 radiant/surfacedialog.cpp:812 +msgid "CAP" +msgstr "" + +#: radiant/patchdialog.cpp:630 radiant/surfacedialog.cpp:821 +msgid "Set..." +msgstr "" + +#: radiant/patchdialog.cpp:636 radiant/surfacedialog.cpp:830 +msgid "Natural" +msgstr "" + +#: radiant/patchdialog.cpp:642 radiant/surfacedialog.cpp:803 +#: radiant/surfacedialog.cpp:839 +msgid "Fit" +msgstr "" + +#: radiant/patchdialog.cpp:652 radiant/surfacedialog.cpp:868 +msgid "Done" +msgstr "" + +#: radiant/surfacedialog.cpp:546 +msgid "Surface inspector" +msgstr "" + +#: radiant/surfacedialog.cpp:562 +msgid "Texture" +msgstr "" + +#: radiant/surfacedialog.cpp:579 +msgid "Horizontal shift" +msgstr "" + +#: radiant/surfacedialog.cpp:596 radiant/surfacedialog.cpp:630 +#: radiant/surfacedialog.cpp:664 radiant/surfacedialog.cpp:698 +#: radiant/surfacedialog.cpp:733 +msgid "Step" +msgstr "" + +#: radiant/surfacedialog.cpp:613 +msgid "Vertical shift" +msgstr "" + +#: radiant/surfacedialog.cpp:647 +msgid "Horizontal stretch" +msgstr "" + +#: radiant/surfacedialog.cpp:681 +msgid "Vertical stretch" +msgstr "" + +#: radiant/surfacedialog.cpp:751 +msgid "Match Grid" +msgstr "" + +#: radiant/surfacedialog.cpp:788 +msgid "Height" +msgstr "" + +#: radiant/surfacedialog.cpp:794 +msgid "Axial" +msgstr "" + +#: radiant/surfacedialog.cpp:892 +msgid "Test" +msgstr "" diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp index 012208c2..2dc4eea0 100644 --- a/radiant/findtexturedialog.cpp +++ b/radiant/findtexturedialog.cpp @@ -27,26 +27,27 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "stdafx.h" #include "findtexturedialog.h" +#include FindTextureDialog g_TexFindDlg; FindTextureDialog& g_dlgFind = g_TexFindDlg; static bool g_bFindActive = true; -static void OnApply(GtkWidget *widget, gpointer data) +static void OnApply(GtkWidget *widget, gpointer data) { g_dlgFind.UpdateData(TRUE); FindReplaceTextures(g_dlgFind.m_strFind, g_dlgFind.m_strReplace, g_dlgFind.m_bSelectedOnly, g_dlgFind.m_bForce, FALSE); } -static void OnFind(GtkWidget *widget, gpointer data) +static void OnFind(GtkWidget *widget, gpointer data) { g_dlgFind.UpdateData(TRUE); FindReplaceTextures(g_dlgFind.m_strFind, g_dlgFind.m_strReplace, g_dlgFind.m_bSelectedOnly, FALSE, TRUE); } -static void OnOK(GtkWidget *widget, gpointer data) +static void OnOK(GtkWidget *widget, gpointer data) { g_dlgFind.UpdateData(TRUE); FindReplaceTextures(g_dlgFind.m_strFind, g_dlgFind.m_strReplace, @@ -54,12 +55,12 @@ static void OnOK(GtkWidget *widget, gpointer data) g_dlgFind.HideDlg (); } -static void OnClose(GtkWidget *widget, gpointer data) +static void OnClose(GtkWidget *widget, gpointer data) { g_dlgFind.HideDlg (); } -static void popup_selected (GtkWidget *widget, gpointer data) +static void popup_selected (GtkWidget *widget, gpointer data) { gchar *str; @@ -67,7 +68,7 @@ static void popup_selected (GtkWidget *widget, gpointer data) gtk_entry_set_text (GTK_ENTRY (data), str); } -static void find_clicked (GtkWidget *widget, gpointer data) +static void find_clicked (GtkWidget *widget, gpointer data) { GtkWidget *menu, *item; menu = gtk_menu_new (); @@ -82,7 +83,7 @@ static void find_clicked (GtkWidget *widget, gpointer data) gtk_menu_append (GTK_MENU (menu), item); } - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 1, GDK_CURRENT_TIME); + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 1, GDK_CURRENT_TIME); } static gint find_focus_in (GtkWidget *widget, GdkEventFocus *event, gpointer data) @@ -212,28 +213,28 @@ void FindTextureDialog::BuildDialog () gtk_widget_show (vbox); gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); - button = gtk_button_new_with_label( "Find" ); + button = gtk_button_new_with_label( _("Find") ); gtk_widget_show( button ); gtk_box_pack_start( GTK_BOX( vbox ), button, FALSE, FALSE, 0 ); gtk_signal_connect( GTK_OBJECT( button ), "clicked", GTK_SIGNAL_FUNC( OnFind ), NULL ); gtk_widget_set_usize( button, 60, -2 ); - button = gtk_button_new_with_label ("OK"); + button = gtk_button_new_with_label (_("OK")); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnOK), NULL); gtk_widget_set_usize (button, 60, -2); - button = gtk_button_new_with_label ("Apply"); + button = gtk_button_new_with_label (_("Apply")); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnApply), NULL); gtk_widget_set_usize (button, 60, -2); - button = gtk_button_new_with_label ("Close"); + button = gtk_button_new_with_label (_("Close")); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp index 761d204a..63d5bf75 100644 --- a/radiant/gtkmisc.cpp +++ b/radiant/gtkmisc.cpp @@ -924,7 +924,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti if (mode == MB_OK) { - w = gtk_button_new_with_label ("Ok"); + w = gtk_button_new_with_label (_("Ok")); gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDOK)); @@ -937,7 +937,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti } else if (mode == MB_OKCANCEL) { - w = gtk_button_new_with_label ("Ok"); + w = gtk_button_new_with_label (_("Ok")); gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDOK)); @@ -946,7 +946,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti gtk_widget_grab_default (w); gtk_widget_show (w); - w = gtk_button_new_with_label ("Cancel"); + w = gtk_button_new_with_label (_("Cancel")); gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDCANCEL)); @@ -956,7 +956,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti } else if (mode == MB_YESNOCANCEL) { - w = gtk_button_new_with_label ("Yes"); + w = gtk_button_new_with_label (_("Yes")); gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDYES)); @@ -964,13 +964,13 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti gtk_widget_grab_default (w); gtk_widget_show (w); - w = gtk_button_new_with_label ("No"); + w = gtk_button_new_with_label (_("No")); gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDNO)); gtk_widget_show (w); - w = gtk_button_new_with_label ("Cancel"); + w = gtk_button_new_with_label (_("Cancel")); gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDCANCEL)); @@ -979,7 +979,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti } else /* if (mode == MB_YESNO) */ { - w = gtk_button_new_with_label ("Yes"); + w = gtk_button_new_with_label (_("Yes")); gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDYES)); @@ -987,7 +987,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti gtk_widget_grab_default (w); gtk_widget_show (w); - w = gtk_button_new_with_label ("No"); + w = gtk_button_new_with_label (_("No")); gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDNO)); @@ -997,7 +997,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti if (URL) { - w = gtk_button_new_with_label ("Go to URL"); + w = gtk_button_new_with_label (_("Go to URL")); gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_url_callback), NULL); diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp index 11cabc95..674d11ff 100644 --- a/radiant/patchdialog.cpp +++ b/radiant/patchdialog.cpp @@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include "stdafx.h" #include "patchdialog.h" +#include PatchDialog g_PatchDialog; // is the patch inspector currently displayed/active? @@ -313,7 +314,7 @@ void PatchDialog::BuildDialog () load_window_pos (dlg, g_PrefsDlg.mWindowInfo.posPatchWnd); - gtk_window_set_title (GTK_WINDOW (dlg), "Patch Properties"); + gtk_window_set_title (GTK_WINDOW (dlg), _("Patch Properties")); gtk_signal_connect (GTK_OBJECT (dlg), "delete_event", GTK_SIGNAL_FUNC (OnDone), NULL); // catch 'Esc' and 'Enter' gtk_signal_connect (GTK_OBJECT (dlg), "key_press_event", GTK_SIGNAL_FUNC (OnDialogKey), NULL); @@ -329,7 +330,7 @@ void PatchDialog::BuildDialog () gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); - frame = gtk_frame_new ("Details"); + frame = gtk_frame_new (_("Details")); gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0); @@ -344,13 +345,13 @@ void PatchDialog::BuildDialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - label = gtk_label_new ("Row:"); + label = gtk_label_new (_("Row:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - label = gtk_label_new ("Column:"); + label = gtk_label_new (_("Column:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -386,31 +387,31 @@ void PatchDialog::BuildDialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - label = gtk_label_new ("X:"); + label = gtk_label_new (_("X:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - label = gtk_label_new ("Y:"); + label = gtk_label_new (_("Y:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - label = gtk_label_new ("Z:"); + label = gtk_label_new (_("Z:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - label = gtk_label_new ("S:"); + label = gtk_label_new (_("S:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - label = gtk_label_new ("T:"); + label = gtk_label_new (_("T:")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 4, 5, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -451,7 +452,7 @@ void PatchDialog::BuildDialog () (GtkAttachOptions) (0), 0, 0); AddDialogData (entry, &m_fT, DLG_ENTRY_FLOAT); - frame = gtk_frame_new ("Texturing"); + frame = gtk_frame_new (_("Texturing")); gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0); @@ -460,7 +461,7 @@ void PatchDialog::BuildDialog () gtk_container_add (GTK_CONTAINER (frame), vbox2); gtk_container_set_border_width (GTK_CONTAINER (vbox2), 5); - label = gtk_label_new ("Name:"); + label = gtk_label_new (_("Name:")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE, TRUE, 0); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); @@ -478,35 +479,35 @@ void PatchDialog::BuildDialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - label = gtk_label_new ("Horizontal Shift Step"); + label = gtk_label_new (_("Horizontal Shift Step")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - label = gtk_label_new ("Vertical Shift Step"); + label = gtk_label_new (_("Vertical Shift Step")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - label = gtk_label_new ("Horizontal Stretch Step"); + label = gtk_label_new (_("Horizontal Stretch Step")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - label = gtk_label_new ("Vertical Stretch Step"); + label = gtk_label_new (_("Vertical Stretch Step")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - label = gtk_label_new ("Rotate Step"); + label = gtk_label_new (_("Rotate Step")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -620,25 +621,25 @@ void PatchDialog::BuildDialog () gtk_widget_show (hbox2); gtk_box_pack_start (GTK_BOX (vbox2), hbox2, TRUE, FALSE, 0); - button = gtk_button_new_with_label ("CAP"); + button = gtk_button_new_with_label (_("CAP")); gtk_widget_show (button); gtk_box_pack_end (GTK_BOX (hbox2), button, TRUE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnBtnPatchdetails), NULL); gtk_widget_set_usize (button, 60, -1); - button = gtk_button_new_with_label ("Set..."); + button = gtk_button_new_with_label (_("Set...")); gtk_widget_show (button); gtk_box_pack_end (GTK_BOX (hbox2), button, TRUE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnBtnPatchreset), NULL); gtk_widget_set_usize (button, 60, -1); - button = gtk_button_new_with_label ("Natural"); + button = gtk_button_new_with_label (_("Natural")); gtk_widget_show (button); gtk_box_pack_end (GTK_BOX (hbox2), button, TRUE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnBtnPatchnatural), NULL); gtk_widget_set_usize (button, 60, -1); - button = gtk_button_new_with_label ("Fit"); + button = gtk_button_new_with_label (_("Fit")); gtk_widget_show (button); gtk_box_pack_end (GTK_BOX (hbox2), button, TRUE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnBtnPatchfit), NULL); @@ -648,13 +649,13 @@ void PatchDialog::BuildDialog () gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, FALSE, 0); - button = gtk_button_new_with_label ("Done"); + button = gtk_button_new_with_label (_("Done")); gtk_widget_show (button); gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnDone), NULL); gtk_widget_set_usize (button, 60, -1); - button = gtk_button_new_with_label ("Apply"); + button = gtk_button_new_with_label (_("Apply")); gtk_widget_show (button); gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnApply), NULL); diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp index 6df9e693..b7c59d76 100644 --- a/radiant/surfacedialog.cpp +++ b/radiant/surfacedialog.cpp @@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include "stdafx.h" #include "surfacedialog.h" +#include SurfaceDlg g_dlgSurface; @@ -57,7 +58,7 @@ bool g_bListenUpdate = true; #ifdef _DEBUG // experimental stuff, work directly on BP -static void OnTest(GtkWidget *widget, gpointer data) +static void OnTest(GtkWidget *widget, gpointer data) { if (!g_qeglobals.m_bBrushPrimitMode) { @@ -100,7 +101,7 @@ static void OnTest(GtkWidget *widget, gpointer data) m[0][0] = 1; m[1][1] = 1; m[0][2] = -Os; m[1][2] = -Ot; BPMatMul(m, pBP->coords, aux); m[0][2] = Os; m[1][2] = Ot; // now M^-1 - BPMatMul(aux, m, BPO); + BPMatMul(aux, m, BPO); #if 0 // apply a scaling @@ -162,7 +163,7 @@ static void OnTest(GtkWidget *widget, gpointer data) vec_t BPO[2][3]; memcpy(&BPO, &pBP->coords, sizeof(vec_t)*6); BPO[0][2] = Os*(pBP->coords[0][0]-1.0) + Ot*pBP->coords[0][1] + pBP->coords[0][2]; - BPO[1][2] = Os*pBP->coords[1][0] + Ot*(pBP->coords[1][1]-1.0) + Ot*pBP->coords[1][2]; + BPO[1][2] = Os*pBP->coords[1][0] + Ot*(pBP->coords[1][1]-1.0) + Ot*pBP->coords[1][2]; // apply a scaling // scale factors against S and T axis, we apply on top of the existing matrix @@ -192,7 +193,7 @@ static void OnTest(GtkWidget *widget, gpointer data) m[0][0] = 1; m[1][1] = 1; m[0][2] = -Os; m[1][2] = -Ot; BPMatMul(m, pBP->coords, aux); m[0][2] = Os; m[1][2] = Ot; // now M^-1 - BPMatMul(aux, m, BPO); + BPMatMul(aux, m, BPO); // apply a scaling // scale factors against S and T axis, we apply on top of the existing matrix @@ -207,7 +208,7 @@ static void OnTest(GtkWidget *widget, gpointer data) */ #endif -static void OnDone(GtkWidget *widget, gpointer data) +static void OnDone(GtkWidget *widget, gpointer data) { g_dlgSurface.GetTexMods(); g_dlgSurface.HideDlg (); @@ -240,7 +241,7 @@ static void OnUpdate (GtkWidget *widget, gpointer data) // reflect the current changes in the views, and make sure // the changes are stored in the undo. -static void OnApply (GtkWidget *widget, gpointer data) +static void OnApply (GtkWidget *widget, gpointer data) { if (!g_bListenChanged) return; @@ -262,7 +263,7 @@ static gint OnTextureKey (GtkWidget* widget, GdkEventKey* event, gpointer data) return FALSE; } -static void OnCancel(GtkWidget *widget, gpointer data) +static void OnCancel(GtkWidget *widget, gpointer data) { g_qeglobals.d_texturewin.texdef = g_old_texdef; // cancel the last do if we own it @@ -364,7 +365,7 @@ static void OnIncrementChanged(GtkWidget *widget, gpointer data) // see fenris #2810 void DoSnapTToGrid(float hscale, float vscale) { - if (hscale == 0.0f) + if (hscale == 0.0f) { (g_qeglobals.m_bBrushPrimitMode) ? hscale = 1.0f : hscale = 0.5f; } @@ -433,19 +434,19 @@ void SurfaceDlgFitAll() return; } -static void OnBtnPatchdetails(GtkWidget *widget, gpointer data) +static void OnBtnPatchdetails(GtkWidget *widget, gpointer data) { Patch_NaturalizeSelected(true); Sys_UpdateWindows(W_ALL); } -static void OnBtnPatchnatural(GtkWidget *widget, gpointer data) +static void OnBtnPatchnatural(GtkWidget *widget, gpointer data) { Patch_NaturalizeSelected(); Sys_UpdateWindows(W_ALL); } -static void OnBtnPatchreset(GtkWidget *widget, gpointer data) +static void OnBtnPatchreset(GtkWidget *widget, gpointer data) { float fx, fy; @@ -454,7 +455,7 @@ static void OnBtnPatchreset(GtkWidget *widget, gpointer data) Sys_UpdateWindows(W_ALL); } -static void OnBtnPatchFit(GtkWidget *widget, gpointer data) +static void OnBtnPatchFit(GtkWidget *widget, gpointer data) { Patch_ResetTexturing(1.0, 1.0); Sys_UpdateWindows(W_ALL); @@ -467,7 +468,7 @@ static void OnBtnAxial(GtkWidget *widget, gpointer data) Sys_UpdateWindows(W_ALL); } -static void OnBtnFaceFit(GtkWidget *widget, gpointer data) +static void OnBtnFaceFit(GtkWidget *widget, gpointer data) { g_dlgSurface.UpdateData(TRUE); if (g_ptrSelectedFaces.GetSize() == 0) @@ -530,7 +531,7 @@ void SurfaceDlg::InitDefaultIncrement(texdef_t *tex) tex->shift[1] = 8; tex->scale[0] = 0.25; tex->scale[1] = 0.25; - tex->rotate = 10; + tex->rotate = 10; } void SurfaceDlg::BuildDialog () @@ -542,7 +543,7 @@ void SurfaceDlg::BuildDialog () load_window_pos (dlg, g_PrefsDlg.mWindowInfo.posSurfaceWnd); - gtk_window_set_title (GTK_WINDOW (dlg), "Surface inspector"); + gtk_window_set_title (GTK_WINDOW (dlg), _("Surface inspector")); //g_signal_connect (G_OBJECT (dlg), "delete_event", G_CALLBACK (OnCancel), NULL); // we catch 'Enter' and interpret is as OnDone gtk_signal_connect (GTK_OBJECT (dlg), "key_press_event", GTK_SIGNAL_FUNC (OnDialogKey), NULL); @@ -558,7 +559,7 @@ void SurfaceDlg::BuildDialog () gtk_widget_show (hbox2); gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, TRUE, 0); - label = gtk_label_new ("Texture"); + label = gtk_label_new (_("Texture")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 0); @@ -575,7 +576,7 @@ void SurfaceDlg::BuildDialog () gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - label = gtk_label_new ("Horizontal shift"); + label = gtk_label_new (_("Horizontal shift")); gtk_widget_show (label); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, @@ -592,13 +593,13 @@ void SurfaceDlg::BuildDialog () (GtkAttachOptions) (0), 0, 0); gtk_widget_set_usize (spin, 60, -2); - label = gtk_label_new ("Step"); + label = gtk_label_new (_("Step")); gtk_widget_show (label); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - + entry = gtk_entry_new (); g_object_set_data (G_OBJECT (dlg), "hshift_inc", entry); gtk_signal_connect (GTK_OBJECT (entry), "changed", @@ -609,7 +610,7 @@ void SurfaceDlg::BuildDialog () (GtkAttachOptions) (0), 0, 0); gtk_widget_set_usize (entry, 50, -2); - label = gtk_label_new ("Vertical shift"); + label = gtk_label_new (_("Vertical shift")); gtk_widget_show (label); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, @@ -625,14 +626,14 @@ void SurfaceDlg::BuildDialog () (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_widget_set_usize (spin, 60, -2); - - label = gtk_label_new ("Step"); + + label = gtk_label_new (_("Step")); gtk_widget_show (label); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - + entry = gtk_entry_new (); g_object_set_data (G_OBJECT (dlg), "vshift_inc", entry); gtk_signal_connect (GTK_OBJECT (entry), "changed", @@ -643,7 +644,7 @@ void SurfaceDlg::BuildDialog () (GtkAttachOptions) (0), 0, 0); gtk_widget_set_usize (entry, 50, -2); - label = gtk_label_new ("Horizontal stretch"); + label = gtk_label_new (_("Horizontal stretch")); gtk_widget_show (label); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, @@ -660,13 +661,13 @@ void SurfaceDlg::BuildDialog () (GtkAttachOptions) (0), 0, 0); gtk_widget_set_usize (spin, 60, -2); - label = gtk_label_new ("Step"); + label = gtk_label_new (_("Step")); gtk_widget_show (label); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 2, 3); - + entry = gtk_entry_new (); g_object_set_data (G_OBJECT (dlg), "hscale_inc", entry); gtk_signal_connect (GTK_OBJECT (entry), "changed", @@ -677,7 +678,7 @@ void SurfaceDlg::BuildDialog () (GtkAttachOptions) (0), 2, 3); gtk_widget_set_usize (entry, 50, -2); - label = gtk_label_new ("Vertical stretch"); + label = gtk_label_new (_("Vertical stretch")); gtk_widget_show (label); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, @@ -693,14 +694,14 @@ void SurfaceDlg::BuildDialog () (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_widget_set_usize (spin, 60, -2); - - label = gtk_label_new ("Step"); + + label = gtk_label_new (_("Step")); gtk_widget_show (label); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - + entry = gtk_entry_new (); g_object_set_data (G_OBJECT (dlg), "vscale_inc", entry); gtk_signal_connect (GTK_OBJECT (entry), "changed", @@ -711,7 +712,7 @@ void SurfaceDlg::BuildDialog () (GtkAttachOptions) (0), 0, 0); gtk_widget_set_usize (entry, 50, -2); - label = gtk_label_new ("Rotate"); + label = gtk_label_new (_("Rotate")); gtk_widget_show (label); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 4, 5, @@ -729,13 +730,13 @@ void SurfaceDlg::BuildDialog () gtk_widget_set_usize (spin, 60, -2); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin), TRUE); - label = gtk_label_new ("Step"); + label = gtk_label_new (_("Step")); gtk_widget_show (label); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 4, 5, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - + entry = gtk_entry_new (); g_object_set_data (G_OBJECT (dlg), "rotate_inc", entry); gtk_signal_connect (GTK_OBJECT (entry), "changed", @@ -747,7 +748,7 @@ void SurfaceDlg::BuildDialog () gtk_widget_set_usize (entry, 50, -2); // match grid button - button = gtk_button_new_with_label ("Match Grid"); + button = gtk_button_new_with_label (_("Match Grid")); gtk_widget_show (button); gtk_table_attach (GTK_TABLE (table), button, 2, 4, 5, 6, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -755,7 +756,7 @@ void SurfaceDlg::BuildDialog () gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnBtnMatchGrid), NULL); - frame = gtk_frame_new ("Texturing"); + frame = gtk_frame_new (_("Texturing")); gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0); @@ -784,13 +785,13 @@ void SurfaceDlg::BuildDialog () (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - label = gtk_label_new ("Height"); + label = gtk_label_new (_("Height")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table), label, 3, 4, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - button = gtk_button_new_with_label ("Axial"); + button = gtk_button_new_with_label (_("Axial")); gtk_widget_show (button); gtk_table_attach (GTK_TABLE (table), button, 0, 1, 1, 2, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -799,7 +800,7 @@ void SurfaceDlg::BuildDialog () GTK_SIGNAL_FUNC (OnBtnAxial), NULL); gtk_widget_set_usize (button, 60, -2); - button = gtk_button_new_with_label ("Fit"); + button = gtk_button_new_with_label (_("Fit")); gtk_widget_show (button); gtk_table_attach (GTK_TABLE (table), button, 1, 2, 1, 2, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -808,7 +809,7 @@ void SurfaceDlg::BuildDialog () GTK_SIGNAL_FUNC (OnBtnFaceFit), NULL); gtk_widget_set_usize (button, 60, -2); - button = gtk_button_new_with_label ("CAP"); + button = gtk_button_new_with_label (_("CAP")); gtk_widget_show (button); gtk_table_attach (GTK_TABLE (table), button, 0, 1, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -817,7 +818,7 @@ void SurfaceDlg::BuildDialog () GTK_SIGNAL_FUNC (OnBtnPatchdetails), NULL); gtk_widget_set_usize (button, 60, -2); - button = gtk_button_new_with_label ("Set..."); + button = gtk_button_new_with_label (_("Set...")); gtk_widget_show (button); gtk_table_attach (GTK_TABLE (table), button, 1, 2, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -826,7 +827,7 @@ void SurfaceDlg::BuildDialog () GTK_SIGNAL_FUNC (OnBtnPatchreset), NULL); gtk_widget_set_usize (button, 60, -2); - button = gtk_button_new_with_label ("Natural"); + button = gtk_button_new_with_label (_("Natural")); gtk_widget_show (button); gtk_table_attach (GTK_TABLE (table), button, 2, 3, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -835,7 +836,7 @@ void SurfaceDlg::BuildDialog () GTK_SIGNAL_FUNC (OnBtnPatchnatural), NULL); gtk_widget_set_usize (button, 60, -2); - button = gtk_button_new_with_label ("Fit"); + button = gtk_button_new_with_label (_("Fit")); gtk_widget_show (button); gtk_table_attach (GTK_TABLE (table), button, 3, 4, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -864,21 +865,21 @@ void SurfaceDlg::BuildDialog () gtk_widget_show (hbox2); gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, TRUE, 0); - button = gtk_button_new_with_label ("Done"); + button = gtk_button_new_with_label (_("Done")); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnDone), NULL); gtk_widget_set_usize (button, 60, -2); - button = gtk_button_new_with_label ("Apply"); + button = gtk_button_new_with_label (_("Apply")); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (OnApply), NULL); gtk_widget_set_usize (button, 60, -2); - button = gtk_button_new_with_label ("Cancel"); + button = gtk_button_new_with_label (_("Cancel")); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", @@ -888,7 +889,7 @@ void SurfaceDlg::BuildDialog () // that's a bit of trashy stuff from Textool-v2 branch #ifdef _DEBUG // FIXME: testing only, scaling in BP mode - button = gtk_button_new_with_label ("Test"); + button = gtk_button_new_with_label (_("Test")); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", @@ -923,7 +924,7 @@ void SurfaceDlg::SetTexMods() if (!g_surfwin) return; - + if (g_ptrSelectedFaces.GetSize() > 0) { face_t *selFace = reinterpret_cast(g_ptrSelectedFaces.GetAt(0)); @@ -946,9 +947,9 @@ void SurfaceDlg::SetTexMods() // brush primitive mode : compute fake shift scale rot representation if (g_qeglobals.m_bBrushPrimitMode) TexMatToFakeTexCoords( bpt->coords, m_shift, &m_rotate, m_scale ); - + g_bListenChanged = false; - + if(strncmp(pt->GetName(), "textures/", 9) != 0) pt->SetName(SHADER_NOT_FOUND); gtk_entry_set_text (GTK_ENTRY (GetDlgWidget ("texture")), pt->GetName()+9); @@ -1010,7 +1011,7 @@ void SurfaceDlg::SetTexMods() gtk_entry_set_text (GTK_ENTRY (GetDlgWidget ("rotate_inc")), buf); g_bListenChanged = true; - + // undo tricks: set the undo id to zero so we don't attempt to undo something that does not belong to us m_nUndoId = 0; // store the current texdef as our escape route if user hits OnCancel @@ -1035,7 +1036,7 @@ void SurfaceDlg::GetTexMods() #ifdef DBG_SI Sys_Printf("SurfaceDlg::GetTexMods\n"); #endif - + if (g_ptrSelectedFaces.GetSize() > 0) { //++timo just a test, we disable the undo when working on selected faces @@ -1053,13 +1054,13 @@ void SurfaceDlg::GetTexMods() Sys_Printf("pt = &g_qeglobals.d_texturewin.texdef\n"); #endif // } - + const char* text = gtk_entry_get_text (GTK_ENTRY (GetDlgWidget ("texture"))); #ifdef DBG_SI Sys_Printf("pt->SetName(%s)\n", text ); #endif - + // TTimo: detect and refuse invalid texture names (at least the ones with spaces) if (text[0] <= ' ' || strchr(text, ' ')) { @@ -1075,7 +1076,7 @@ void SurfaceDlg::GetTexMods() } - (g_qeglobals.m_bBrushPrimitMode ? m_shift[0] : pt->shift[0]) = + (g_qeglobals.m_bBrushPrimitMode ? m_shift[0] : pt->shift[0]) = gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (GetDlgWidget ("hshift"))); (g_qeglobals.m_bBrushPrimitMode ? m_shift[1] : pt->shift[1]) = gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (GetDlgWidget ("vshift"))); -- 2.39.2