1 files changed, 8 insertions, 8 deletions

diff --git a/noncore/net/opierdesktop/qtwin.cpp b/noncore/net/opierdesktop/qtwin.cpp
index 54a5a03..71ba5a5 100644
--- a/noncore/net/opierdesktop/qtwin.cpp
+++ b/noncore/net/opierdesktop/qtwin.cpp
@@ -1,436 +1,436 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    User interface services - X Window System
    Copyright (C) Matthew Chapman 1999-2002
    qt.cpp by Jay Sorg
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include "rdesktop.h"
 #include <qpe/qpeapplication.h>
 #include <qmainwindow.h>
 #include <qwidget.h>
 #include <qpainter.h>
 #include <qimage.h>
 #include <qsocketnotifier.h>
 #include <qscrollview.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qfile.h>
 #include <qcheckbox.h>
 #include <qpopupmenu.h>
 #include "qtwin.h"
 #include <stdlib.h>
 
 uint32 flags;
 char server[64] = "";
 char domain[16] = "";
 char password[16] = "";
 char shell[128] = "";
 char directory[32] = "";
 
 extern int g_width;
 extern int g_height;
 extern int server_bpp;
 extern BOOL fullscreen;
 extern char username[];
 int global_sock;
 
 QSocketNotifier* SocketNotifier;
 QPEApplication* App;
 QMyMainWindow* MW;
 QMyScrollView* SV;
 struct QColorMap
 {
   uint32 RGBColors[256];
   int NumColors;
 };
 QColorMap* CM;
 uint8* BS;
 int clipx;
 int clipy;
 int clipcx;
 int clipcy;
 
 struct bitmap
 {
   int w;
   int h;
   uint8* data;
 };
 
 BOOL owncolmap = False;
 
 //*****************************************************************************
 void CleanString(QString* Item)
 {
   int i;
 
   i = Item->length() - 1;
   while (i >= 0)
   {
     if (Item->at(i) == 10 || Item->at(i) == 13)
       Item->remove(i, 1);
     i--;
   }
 }
 
 //*****************************************************************************
 QMyDialog::QMyDialog(QWidget* parent) : QDialog(parent, "Settings", true)
 {
   setCaption( tr( "Configuration" ) );
   int i, j;
   char* home;
   char Text[256];
   QString Line;
   QString ItemName;
   QString ItemValue;
 
   // resize dialog
   resize(230, 270);
   // main list box
   ListBox = new QListBox(this);
   ListBox->move(10, 10);
   ListBox->resize(200, 100);
   connect(ListBox, SIGNAL(selectionChanged()), this, SLOT(ListBoxChanged()));
   connect(ListBox, SIGNAL(selected(int)), this, SLOT(ListBoxSelected(int)));
   // server
   Label1 = new QLabel(this);
-  Label1->setText("Server Desc");
+  Label1->setText( tr("Server Desc") );
   Label1->move(10, 120);
   Label1->resize(100, 20);
   ServerNameEdit = new QLineEdit(this);
   ServerNameEdit->move(75, 120);
   ServerNameEdit->resize(100, 20);
   // username
   Label2 = new QLabel(this);
-  Label2->setText("User Name");
+  Label2->setText( tr("User Name") );
   Label2->move(10, 150);
   Label2->resize(100, 20);
   UserNameEdit = new QLineEdit(this);
   UserNameEdit->move(75, 150);
   UserNameEdit->resize(100, 20);
   // ip
   Label3 = new QLabel(this);
-  Label3->setText("Server IP");
+  Label3->setText( tr("Server Address") );
   Label3->move(10, 180);
   Label3->resize(100, 20);
   IPEdit = new QLineEdit(this);
   IPEdit->move(75, 180);
   IPEdit->resize(100, 20);
   // width and height
   WidthHeightBox = new QComboBox(this);
   WidthHeightBox->move(10, 210);
   WidthHeightBox->resize(100, 20);
   WidthHeightBox->insertItem("240x320");
   WidthHeightBox->insertItem("640x480");
   WidthHeightBox->insertItem("800x600");
   connect(WidthHeightBox, SIGNAL(activated(int)), this, SLOT(ComboChanged(int)));
   WidthHeightBox->setCurrentItem(1);
   WidthEdit = new QLineEdit(this);
   WidthEdit->move(110, 210);
   WidthEdit->resize(30, 20);
   WidthEdit->setText("800");
   HeightEdit = new QLineEdit(this);
   HeightEdit->move(140, 210);
   HeightEdit->resize(30, 20);
   HeightEdit->setText("600");
   // add to list button
   AddButton = new QPushButton(this);
   AddButton->move(180, 120);
   AddButton->resize(50, 20);
-  AddButton->setText("Add");
+  AddButton->setText(tr("Add", "Add Connection"));
   connect(AddButton, SIGNAL(clicked()), this, SLOT(AddClicked()));
   // change list item button
   EditButton = new QPushButton(this);
   EditButton->move(180, 140);
   EditButton->resize(50, 20);
-  EditButton->setText("Edit");
+  EditButton->setText(tr("Edit"));
   connect(EditButton, SIGNAL(clicked()), this, SLOT(EditClicked()));
   // save to file button
   SaveButton = new QPushButton(this);
   SaveButton->move(180, 160);
   SaveButton->resize(50, 20);
-  SaveButton->setText("Save");
+  SaveButton->setText(tr("Save"));
   connect(SaveButton, SIGNAL(clicked()), this, SLOT(SaveClicked()));
   // remove an item button
   RemoveButton = new QPushButton(this);
   RemoveButton->move(180, 180);
   RemoveButton->resize(50, 20);
-  RemoveButton->setText("Remove");
+  RemoveButton->setText(tr("Remove"));
   connect(RemoveButton, SIGNAL(clicked()), this, SLOT(RemoveClicked()));
   // full screen check box
   FullScreenCheckBox = new QCheckBox(this, "Full Screen");
-  FullScreenCheckBox->setText("Full Screen");
+  FullScreenCheckBox->setText(tr("Full Screen"));
   FullScreenCheckBox->move(10, 230);
   // ok button
 
   for (i = 0; i < 10; i++)
   {
     ConnectionList[i] = new QMyConnectionItem;
     ConnectionList[i]->ServerName = "";
     ConnectionList[i]->UserName = "";
     ConnectionList[i]->ServerIP = "";
     ConnectionList[i]->Width = 0;
     ConnectionList[i]->Height = 0;
     ConnectionList[i]->FullScreen = 0;
   }
   home = getenv("HOME");
   if (home != NULL)
   {
     sprintf(Text, "%s/rdesktop.ini", home);
     QFile* File = new QFile(Text);
     if (File->open(IO_ReadOnly))
     {
       i = -1;
       while (!File->atEnd())
       {
         File->readLine(Line, 255);
         j = Line.find("=");
         if (j > 0)
         {
           ItemName = Line.mid(0, j);
           CleanString(&ItemName);
           ItemValue = Line.mid(j + 1);
           CleanString(&ItemValue);
           if (ItemName == "Server")
           {
             i++;
             ConnectionList[i]->ServerName = ItemValue;
             ListBox->insertItem(ItemValue);
           }
           else if (ItemName == "UserName")
             ConnectionList[i]->UserName = ItemValue;
           else if (ItemName == "Width")
             ConnectionList[i]->Width = ItemValue.toInt();
           else if (ItemName == "Height")
             ConnectionList[i]->Height = ItemValue.toInt();
           else if (ItemName == "IP")
             ConnectionList[i]->ServerIP = ItemValue;
           else if (ItemName == "FullScreen")
             ConnectionList[i]->FullScreen = (ItemValue != "0");
         }
       }
     }
     delete File;
   }
 }
 
 //*****************************************************************************
 QMyDialog::~QMyDialog()
 {
   QMyConnectionItem* Item;
   int i;
 
   for (i = 0; i < 10; i++)
   {
     Item = ConnectionList[i];
     delete Item;
   }
 }
 
 //*****************************************************************************
 void QMyDialog::ComboChanged(int index)
 {
   if (index == 0)
   {
     WidthEdit->setText("240");
     HeightEdit->setText("320");
   }
   if (index == 1)
   {
     WidthEdit->setText("640");
     HeightEdit->setText("480");
   }
   else if (index == 2)
   {
     WidthEdit->setText("800");
     HeightEdit->setText("600");
   }
 }
 
 //*****************************************************************************
 void QMyDialog::accept()
 {
   ServerName = ServerNameEdit->text();
   UserName = UserNameEdit->text();
   Width = WidthEdit->text().toInt();
   Height = HeightEdit->text().toInt();
   ServerIP = IPEdit->text();
   FullScreen = FullScreenCheckBox->isChecked();
 
   QDialog::accept();
 }
 
 
 //*****************************************************************************
 void QMyDialog::AddClicked()
 {
   int i;
   QMyConnectionItem* Item;
 
   i = ListBox->count();
   if (i < 10)
   {
     ListBox->insertItem(ServerNameEdit->text());
     Item = ConnectionList[i];
     Item->ServerName = ServerNameEdit->text();
     Item->UserName = UserNameEdit->text();
     Item->Width = WidthEdit->text().toInt();
     Item->Height = HeightEdit->text().toInt();
     Item->ServerIP = IPEdit->text();
     Item->FullScreen = FullScreenCheckBox->isChecked();
   }
 }
 
 //*****************************************************************************
 void QMyDialog::EditClicked()
 {
   int i;
   QMyConnectionItem* Item;
 
   i = ListBox->currentItem();
   if (i >= 0)
   {
     Item = ConnectionList[i];
     Item->ServerName = ServerNameEdit->text();
     Item->UserName = UserNameEdit->text();
     Item->Width = WidthEdit->text().toInt();
     Item->Height = HeightEdit->text().toInt();
     Item->ServerIP = IPEdit->text();
     Item->FullScreen = FullScreenCheckBox->isChecked();
     ListBox->changeItem(ServerNameEdit->text(), i);
   }
 }
 
 //*****************************************************************************
 void WriteString(QFile* File, QString* Line)
 {
   File->writeBlock((const char*)(*Line), Line->length());
 }
 
 //*****************************************************************************
 void QMyDialog::SaveClicked()
 {
   int i, j;
   QMyConnectionItem* Item;
   QString Line;
   char* home;
   char Text[256];
   QFile* File;
 
   home = getenv("HOME");
   if (home != NULL)
   {
     sprintf(Text, "%s/rdesktop.ini", home);
     File = new QFile(Text);
     if (File->open(IO_Truncate | IO_ReadWrite))
     {
       i = ListBox->count();
       for (j = 0; j < i; j++)
       {
         Item = ConnectionList[j];
         Line = "Server=";
         Line += Item->ServerName;
         Line += (char)10;
         WriteString(File, &Line);
         Line = "UserName=";
         Line += Item->UserName;
         Line += (char)10;
         WriteString(File, &Line);
         Line = "Width=";
         sprintf(Text, "%d", Item->Width);
         Line += Text;
         Line += (char)10;
         WriteString(File, &Line);
         Line = "Height=";
         sprintf(Text, "%d", Item->Height);
         Line += Text;
         Line += (char)10;
         WriteString(File, &Line);
         Line = "IP=";
         Line += Item->ServerIP;
         Line += (char)10;
         WriteString(File, &Line);
         Line = "FullScreen=";
         if (Item->FullScreen)
           Line += "1";
         else
           Line += "0";
         Line += (char)10;
         WriteString(File, &Line);
       }
     }
     File->flush();
     File->close();
     delete File;
   }
 }
 
 //*****************************************************************************
 void QMyDialog::RemoveClicked()
 {
   int i, j, c;
   QMyConnectionItem* Item1;
   QMyConnectionItem* Item2;
 
   i = ListBox->currentItem();
   if (i >= 0)
   {
     c = ListBox->count();
     for (j = i; j < c - 1; j++)
     {
       Item1 = ConnectionList[i];
       Item2 = ConnectionList[i + 1];
       Item1->ServerName = Item2->ServerName;
       Item1->UserName = Item2->UserName;
       Item1->Width = Item2->Width;
       Item1->Height = Item2->Height;
       Item1->ServerIP = Item2->ServerIP;
       Item1->FullScreen = Item2->FullScreen;
     }
     ListBox->removeItem(i);
   }
 }
 
 //*****************************************************************************
 void QMyDialog::ListBoxChanged()
 {
   int i;
   QMyConnectionItem* Item;
   char Text[100];
 
   i = ListBox->currentItem();
   if (i >= 0 && i < 10)
   {
     Item = ConnectionList[i];
     ServerNameEdit->setText(Item->ServerName);
     UserNameEdit->setText(Item->UserName);
     sprintf(Text, "%d", Item->Width);
     WidthEdit->setText(Text);
     sprintf(Text, "%d", Item->Height);
     HeightEdit->setText(Text);
     IPEdit->setText(Item->ServerIP);
     FullScreenCheckBox->setChecked(Item->FullScreen != 0);
   }
 }
 
 //*****************************************************************************
 void QMyDialog::ListBoxSelected(int /*index*/)
 {