Changeset 296 for GtkRadiant/trunk

Show
Ignore:
Timestamp:
07/05/08 03:53:43 (5 months ago)
Author:
mattn
Message:

* reactivated some old quake2 code
* more translateable strings

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • GtkRadiant/trunk/plugins/image/image.cpp

    r185 r296  
    33All rights reserved. 
    44 
    5 Redistribution and use in source and binary forms, with or without modification,  
     5Redistribution and use in source and binary forms, with or without modification, 
    66are permitted provided that the following conditions are met: 
    77 
    8 Redistributions of source code must retain the above copyright notice, this list  
     8Redistributions of source code must retain the above copyright notice, this list 
    99of conditions and the following disclaimer. 
    1010 
    …… 
    1313other materials provided with the distribution. 
    1414 
    15 Neither the name of Loki software nor the names of its contributors may be used  
    16 to endorse or promote products derived from this software without specific prior  
    17 written permission.  
     15Neither the name of Loki software nor the names of its contributors may be used 
     16to endorse or promote products derived from this software without specific prior 
     17written permission. 
    1818 
    19 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''  
    20 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE  
    21 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE  
    22 DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY  
    23 DIRECT,INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES  
    24 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  
    25 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON  
    26 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT  
    27 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS  
    28 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
     19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' 
     20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
     21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
     22DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY 
     23DIRECT,INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
     24(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
     25LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
     26ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
     27(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
     28SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
    2929*/ 
    3030 
    …… 
    5151CSynapseClientImage g_SynapseClient; 
    5252 
    53 static const XMLConfigEntry_t entries[] =  
    54   {  
     53static const XMLConfigEntry_t entries[] = 
     54  { 
    5555    { VFS_MAJOR, SYN_REQUIRE, sizeof(g_FileSystemTable), &g_FileSystemTable }, 
    5656    { NULL, SYN_UNKNOWN, 0, NULL } }; 
    …… 
    7474  g_SynapseClient.AddAPI(IMAGE_MAJOR, "jpg", sizeof(_QERPlugImageTable)); 
    7575  g_SynapseClient.AddAPI(IMAGE_MAJOR, "tga", sizeof(_QERPlugImageTable)); 
    76   // NOTE: these two are for md2 support 
     76  // NOTE: these two are for md2 support - check b_isQuake2 here? 
    7777  // instead of requesting them systematically, we could request them per-config before enabling Q2 support 
    7878  g_SynapseClient.AddAPI(IMAGE_MAJOR, "pcx", sizeof(_QERPlugImageTable)); 
    7979  g_SynapseClient.AddAPI(IMAGE_MAJOR, "bmp", sizeof(_QERPlugImageTable)); 
    8080  g_SynapseClient.AddAPI(RADIANT_MAJOR, NULL, sizeof(_QERFuncTable_1), SYN_REQUIRE, &g_FuncTable); 
    81    
     81 
    8282  if ( !g_SynapseClient.ConfigXML( pServer, NULL, entries ) ) { 
    8383    return NULL; 
    8484  } 
    85    
     85 
    8686  return &g_SynapseClient; 
    8787} 
    …… 
    9090{ 
    9191  if (!strcmp(pAPI->major_name, "image")) 
    92   {     
     92  { 
    9393    _QERPlugImageTable* pTable= static_cast<_QERPlugImageTable*>(pAPI->mpTable); 
    9494    if (!strcmp(pAPI->minor_name, "jpg")) 
    95     {       
     95    { 
    9696      pTable->m_pfnLoadImage = &LoadJPG; 
    9797      return true; 

  • GtkRadiant/trunk/radiant.pot

    r292 r296  
    21672167 
    21682168#: radiant/gtkdlgs.cpp:2824 radiant/gtkdlgs.cpp:1707 radiant/gtkdlgs.cpp:2823 
     2169#: radiant/groupdialog.cpp:1475 
    21692170msgid "Key" 
    21702171msgstr "" 
    …… 
    23342335msgstr "" 
    23352336 
    2336 #: radiant/gtkdlgs.cpp:1713 
     2337#: radiant/gtkdlgs.cpp:1713 radiant/groupdialog.cpp:1466 
    23372338msgid "Value" 
    23382339msgstr "" 
    …… 
    26722673msgid "Test" 
    26732674msgstr "" 
     2675 
     2676#: radiant/groupdialog.cpp:1344 
     2677msgid "!Easy" 
     2678msgstr "" 
     2679 
     2680#: radiant/groupdialog.cpp:1352 
     2681msgid "!Medium" 
     2682msgstr "" 
     2683 
     2684#: radiant/groupdialog.cpp:1360 
     2685msgid "!Hard" 
     2686msgstr "" 
     2687 
     2688#: radiant/groupdialog.cpp:1368 
     2689msgid "!DeathMatch" 
     2690msgstr "" 
     2691 
     2692#: radiant/groupdialog.cpp:1495 
     2693msgid "360" 
     2694msgstr "" 
     2695 
     2696#: radiant/groupdialog.cpp:1504 
     2697msgid "45" 
     2698msgstr "" 
     2699 
     2700#: radiant/groupdialog.cpp:1513 
     2701msgid "90" 
     2702msgstr "" 
     2703 
     2704#: radiant/groupdialog.cpp:1523 
     2705msgid "135" 
     2706msgstr "" 
     2707 
     2708#: radiant/groupdialog.cpp:1532 
     2709msgid "180" 
     2710msgstr "" 
     2711 
     2712#: radiant/groupdialog.cpp:1541 
     2713msgid "225" 
     2714msgstr "" 
     2715 
     2716#: radiant/groupdialog.cpp:1550 
     2717msgid "270" 
     2718msgstr "" 
     2719 
     2720#: radiant/groupdialog.cpp:1559 
     2721msgid "315" 
     2722msgstr "" 
     2723 
     2724#: radiant/groupdialog.cpp:1574 
     2725msgid "Reset" 
     2726msgstr "" 
     2727 
     2728#: radiant/groupdialog.cpp:1581 
     2729msgid "Up" 
     2730msgstr "" 
     2731 
     2732#: radiant/groupdialog.cpp:1588 
     2733msgid "Dn" 
     2734msgstr "" 
     2735 
     2736#: radiant/groupdialog.cpp:1601 
     2737msgid "Del Key/Pair" 
     2738msgstr "" 
     2739 
     2740#: radiant/groupdialog.cpp:1608 
     2741msgid "Sound..." 
     2742msgstr "" 
     2743 
     2744#: radiant/groupdialog.cpp:1615 
     2745msgid "Model..." 
     2746msgstr "" 
     2747 
     2748#: radiant/groupdialog.cpp:1644 
     2749msgid "Console" 
     2750msgstr "" 

  • GtkRadiant/trunk/radiant/groupdialog.cpp

    r289 r296  
    13411341              } 
    13421342 
    1343               //++timo cleanme: these flags where Q2 stuff 
    1344             /* 
    1345               check = gtk_check_button_new_with_label ("!Easy"); 
    1346               gtk_widget_show (check); 
    1347               gtk_signal_connect (GTK_OBJECT (check), "toggled", GTK_SIGNAL_FUNC (entity_check), NULL); 
    1348               gtk_table_attach (GTK_TABLE (table), check, 2, 3, 0, 1, 
    1349                                 (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 
    1350                                 (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); 
    1351               EntWidgets[EntCheck17] = check; 
    1352  
    1353               check = gtk_check_button_new_with_label ("!Medium"); 
    1354               gtk_widget_show (check); 
    1355               gtk_signal_connect (GTK_OBJECT (check), "toggled", GTK_SIGNAL_FUNC (entity_check), NULL); 
    1356               gtk_table_attach (GTK_TABLE (table), check, 2, 3, 1, 2, 
    1357                                 (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 
    1358                                 (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); 
    1359               EntWidgets[EntCheck18] = check; 
    1360  
    1361               check = gtk_check_button_new_with_label ("!Hard"); 
    1362               gtk_widget_show (check); 
    1363               gtk_signal_connect (GTK_OBJECT (check), "toggled", GTK_SIGNAL_FUNC (entity_check), NULL); 
    1364               gtk_table_attach (GTK_TABLE (table), check, 2, 3, 2, 3, 
    1365                                 (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 
    1366                                 (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); 
    1367               EntWidgets[EntCheck19] = check; 
    1368  
    1369               check = gtk_check_button_new_with_label ("!DeathMatch"); 
    1370               gtk_widget_show (check); 
    1371               gtk_signal_connect (GTK_OBJECT (check), "toggled", GTK_SIGNAL_FUNC (entity_check), NULL); 
    1372               gtk_table_attach (GTK_TABLE (table), check, 2, 3, 3, 4, 
    1373                                 (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 
    1374                                 (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); 
    1375               EntWidgets[EntCheck20] = check; 
    1376             */ 
     1343                                if (g_pGameDescription->quake2 || ( g_pGameDescription->mGameFile == "q2.game" ) || ( g_pGameDescription->mGameFile == "heretic2.game" )) { 
     1344                                        GtkWidget *check = gtk_check_button_new_with_label (_("!Easy")); 
     1345                                        gtk_widget_show (check); 
     1346                                        gtk_signal_connect (GTK_OBJECT (check), "toggled", GTK_SIGNAL_FUNC (entity_check), NULL); 
     1347/*                                      gtk_table_attach (GTK_TABLE (table), check, 2, 3, 0, 1, 
     1348                                                                                (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 
     1349                                                                                (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);*/ 
     1350                                        EntWidgets[EntCheck17] = check; 
     1351 
     1352                                        check = gtk_check_button_new_with_label (_("!Medium")); 
     1353                                        gtk_widget_show (check); 
     1354                                        gtk_signal_connect (GTK_OBJECT (check), "toggled", GTK_SIGNAL_FUNC (entity_check), NULL); 
     1355/*                                      gtk_table_attach (GTK_TABLE (table), check, 2, 3, 1, 2, 
     1356                                                                                (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 
     1357                                                                                (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);*/ 
     1358                                        EntWidgets[EntCheck18] = check; 
     1359 
     1360                                        check = gtk_check_button_new_with_label (_("!Hard")); 
     1361                                        gtk_widget_show (check); 
     1362                                        gtk_signal_connect (GTK_OBJECT (check), "toggled", GTK_SIGNAL_FUNC (entity_check), NULL); 
     1363/*                                      gtk_table_attach (GTK_TABLE (table), check, 2, 3, 2, 3, 
     1364                                                                                (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 
     1365                                                                                (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);*/ 
     1366                                        EntWidgets[EntCheck19] = check; 
     1367 
     1368                                        check = gtk_check_button_new_with_label (_("!DeathMatch")); 
     1369                                        gtk_widget_show (check); 
     1370                                        gtk_signal_connect (GTK_OBJECT (check), "toggled", GTK_SIGNAL_FUNC (entity_check), NULL); 
     1371/*                                      gtk_table_attach (GTK_TABLE (table), check, 2, 3, 3, 4, 
     1372                                                                                (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 
     1373                                                                                (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);*/ 
     1374                                        EntWidgets[EntCheck20] = check; 
     1375                                } 
    13771376            } 
    13781377 
    …… 
    14651464 
    14661465        { 
    1467           GtkWidget* label = gtk_label_new ("Value"); 
     1466          GtkWidget* label = gtk_label_new (_("Value")); 
    14681467          gtk_widget_show (label); 
    14691468          gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, 
    …… 
    14741473 
    14751474        { 
    1476           GtkWidget* label = gtk_label_new ("Key"); 
     1475          GtkWidget* label = gtk_label_new (_("Key")); 
    14771476          gtk_widget_show (label); 
    14781477          gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, 
    …… 
    14941493 
    14951494          { 
    1496             GtkWidget* button = gtk_button_new_with_label ("360"); 
     1495            GtkWidget* button = gtk_button_new_with_label (_("360")); 
    14971496            gtk_widget_show (button); 
    14981497            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (entitylist_angle), (void *)"360"); 
    …… 
    15031502 
    15041503          { 
    1505             GtkWidget* button = gtk_button_new_with_label ("45"); 
     1504            GtkWidget* button = gtk_button_new_with_label (_("45")); 
    15061505            gtk_widget_show (button); 
    15071506            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (entitylist_angle), (void *)"45"); 
    …… 
    15121511 
    15131512          { 
    1514             GtkWidget* button = gtk_button_new_with_label ("90"); 
     1513            GtkWidget* button = gtk_button_new_with_label (_("90")); 
    15151514            gtk_widget_show (button); 
    15161515            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (entitylist_angle), (void *)"90"); 
    …… 
    15221521 
    15231522          { 
    1524             GtkWidget* button = gtk_button_new_with_label ("135"); 
     1523            GtkWidget* button = gtk_button_new_with_label (_("135")); 
    15251524            gtk_widget_show (button); 
    15261525            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (entitylist_angle), (void *)"135"); 
    …… 
    15311530 
    15321531          { 
    1533             GtkWidget* button = gtk_button_new_with_label ("180"); 
     1532            GtkWidget* button = gtk_button_new_with_label (_("180")); 
    15341533            gtk_widget_show (button); 
    15351534            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (entitylist_angle), (void *)"180"); 
    …… 
    15401539 
    15411540          { 
    1542             GtkWidget* button = gtk_button_new_with_label ("225"); 
     1541            GtkWidget* button = gtk_button_new_with_label (_("225")); 
    15431542            gtk_widget_show (button); 
    15441543            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (entitylist_angle), (void *)"225"); 
    …… 
    15491548 
    15501549          { 
    1551             GtkWidget* button = gtk_button_new_with_label ("270"); 
     1550            GtkWidget* button = gtk_button_new_with_label (_("270")); 
    15521551            gtk_widget_show (button); 
    15531552            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (entitylist_angle), (void *)"270"); 
    …… 
    15581557 
    15591558          { 
    1560             GtkWidget* button = gtk_button_new_with_label ("315"); 
     1559            GtkWidget* button = gtk_button_new_with_label (_("315")); 
    15611560            gtk_widget_show (button); 
    15621561            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (entitylist_angle), (void *)"315"); 
    …… 
    15731572 
    15741573          { 
    1575             GtkWidget* button = gtk_button_new_with_label ("Reset"); 
     1574            GtkWidget* button = gtk_button_new_with_label (_("Reset")); 
    15761575            gtk_widget_show (button); 
    15771576            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (ResetEntity), NULL); 
    …… 
    15801579 
    15811580          { 
    1582             GtkWidget* button = gtk_button_new_with_label ("Up"); 
     1581            GtkWidget* button = gtk_button_new_with_label (_("Up")); 
    15831582            gtk_widget_show (button); 
    15841583            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (entitylist_angle), (void *)"-1"); 
    …… 
    15871586 
    15881587          { 
    1589             GtkWidget* button = gtk_button_new_with_label ("Dn"); 
     1588            GtkWidget* button = gtk_button_new_with_label (_("Dn")); 
    15901589            gtk_widget_show (button); 
    15911590            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (entitylist_angle), (void *)"-2"); 
    …… 
    16001599 
    16011600          { 
    1602             GtkWidget* button = gtk_button_new_with_label ("Del Key/Pair"); 
     1601            GtkWidget* button = gtk_button_new_with_label (_("Del Key/Pair")); 
    16031602            gtk_widget_show (button); 
    16041603            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (DelProp), NULL); 
    …… 
    16071606 
    16081607          { 
    1609             GtkWidget* button = gtk_button_new_with_label ("Sound..."); 
     1608            GtkWidget* button = gtk_button_new_with_label (_("Sound...")); 
    16101609            gtk_widget_show (button); 
    16111610            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (AssignSound), NULL); 
    …… 
    16141613 
    16151614          { 
    1616             GtkWidget* button = gtk_button_new_with_label ("Model..."); 
     1615            GtkWidget* button = gtk_button_new_with_label (_("Model...")); 
    16171616            gtk_widget_show (button); 
    16181617            gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (AssignModel), NULL); 
    …… 
    16431642 
    16441643        { 
    1645           GtkWidget* label = gtk_label_new ("Console"); 
     1644          GtkWidget* label = gtk_label_new (_("Console")); 
    16461645          gtk_widget_show (label); 
    16471646          gtk_notebook_append_page (GTK_NOTEBOOK (notebook), scr, label); 
    …… 
    16731672  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); 
    16741673 
    1675   button = gtk_button_new_with_label ("Add..."); 
     1674  button = gtk_button_new_with_label (_("Add...")); 
    16761675  gtk_widget_show (button); 
    16771676  gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (groupdlg_add), NULL); 
    …… 
    16791678  gtk_widget_set_usize (button, 60, -2); 
    16801679 
    1681   button = gtk_button_new_with_label ("Edit..."); 
     1680  button = gtk_button_new_with_label (_("Edit...")); 
    16821681  gtk_widget_show (button); 
    16831682  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); 
    16841683  gtk_widget_set_usize (button, 60, -2); 
    16851684 
    1686   button = gtk_button_new_with_label ("Delete"); 
     1685  button = gtk_button_new_with_label (_("Delete")); 
    16871686  gtk_widget_show (button); 
    16881687  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); 
    16891688  gtk_widget_set_usize (button, 60, -2); 
    16901689 
    1691   label = gtk_label_new ("Groups"); 
     1690  label = gtk_label_new (_("Groups")); 
    16921691  gtk_widget_show (label); 
    16931692  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label); 
    16941693  */ 
    16951694  inspector_mode = W_ENTITY; 
    1696   //  gtk_window_set_title (GTK_WINDOW (dlg), "Entities"); 
     1695  //  gtk_window_set_title (GTK_WINDOW (dlg), _("Entities")); 
    16971696  m_pWidget = dlg; 
    16981697  /* 

  • GtkRadiant/trunk/radiant/groupdialog.h

    r183 r296  
    5050  EntCheck16, 
    5151 
    52 /* 
    5352  EntCheck17, 
    5453  EntCheck18, 
    5554  EntCheck19, 
    5655  EntCheck20, 
    57 */ 
     56 
    5857  EntProps, 
    5958  EntDir0, 
    …… 
    8079}; 
    8180 
    82 // 17..20 where used for spawnflags (!Easy !Medium !Hard etc.), empty now.. 
    8381extern GtkWidget* EntWidgets[EntLast]; 
    8482 
    …… 
    8684 
    8785 
    88 class GroupDlg  
     86class GroupDlg 
    8987{ 
    9088 public: 

  • GtkRadiant/trunk/radiant/preferences.cpp

    r289 r296  
    28852885    mLocalPrefs.GetPref(TEXTURE_KEY,            &m_bTextureWindow,              TRUE); 
    28862886  } 
    2887   else if ( ( g_pGameDescription->mGameFile == "q2.game" ) || ( g_pGameDescription->mGameFile == "heretic2.game" ) ) 
     2887  else if (g_pGameDescription->quake2 || ( g_pGameDescription->mGameFile == "q2.game" ) || ( g_pGameDescription->mGameFile == "heretic2.game" )) 
    28882888  { 
    28892889    // BSP monitoring is implemented in Quake2 and Heretic2 tools