[X2Go-Commits] [x2goclient] 05/06: src/{{InteractionDialog, configdialog, connectionwidget, editconnectiondialog, folderbutton, mediawidget, ongetpass, onmainwindow, printprocess, printwidget, sessionbutton, sessionmanagedialog, sessionwidget, settingswidget, sharewidget}.cpp, x2goclientconfig.h}: drop Maemo support.

git-admin at x2go.org git-admin at x2go.org
Wed Nov 30 23:52:15 CET 2022


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 54e530d9d192a106c9449efa16717adcd3dbb307
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Nov 30 23:29:10 2022 +0100

    src/{{InteractionDialog,configdialog,connectionwidget,editconnectiondialog,folderbutton,mediawidget,ongetpass,onmainwindow,printprocess,printwidget,sessionbutton,sessionmanagedialog,sessionwidget,settingswidget,sharewidget}.cpp,x2goclientconfig.h}: drop Maemo support.
---
 debian/changelog             |   5 ++
 src/InteractionDialog.cpp    |   4 --
 src/configdialog.cpp         |  17 -------
 src/connectionwidget.cpp     |  23 ---------
 src/editconnectiondialog.cpp |  24 ---------
 src/folderbutton.cpp         |   4 --
 src/mediawidget.cpp          |   6 ---
 src/ongetpass.cpp            |   2 -
 src/onmainwindow.cpp         | 119 ++-----------------------------------------
 src/printprocess.cpp         |  15 +-----
 src/printwidget.cpp          |  32 ++++--------
 src/sessionbutton.cpp        |  20 +-------
 src/sessionmanagedialog.cpp  |  12 ++---
 src/sessionwidget.cpp        |  42 ---------------
 src/settingswidget.cpp       |  23 ---------
 src/sharewidget.cpp          |   8 ---
 src/x2goclientconfig.h       |   4 --
 17 files changed, 28 insertions(+), 332 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46d5fd8..bf44e46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -198,6 +198,11 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
      - res/img/icons: drop Maemo support, remove hildon subdirectory.
      - res/img/svg: drop Maemo support, remove bg_hildon.svg.
      - res/resources.qrc: drop Maemo support, remove bg_hildon.svg entry.
+     - src/{{InteractionDialog,configdialog,connectionwidget,
+             editconnectiondialog,folderbutton,mediawidget,ongetpass,
+             onmainwindow,printprocess,printwidget,sessionbutton,
+             sessionmanagedialog,sessionwidget,settingswidget,
+             sharewidget}.cpp,x2goclientconfig.h}: drop Maemo support.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 13 Feb 2020 12:31:20 +0100
 
diff --git a/src/InteractionDialog.cpp b/src/InteractionDialog.cpp
index 2440f41..03deacc 100644
--- a/src/InteractionDialog.cpp
+++ b/src/InteractionDialog.cpp
@@ -62,11 +62,7 @@ InteractionDialog::InteractionDialog(ONMainWindow* mainw, QWidget* parent): SVGF
 
     QFont fnt=this->font();
     if ( mw->retMiniMode() )
-#ifdef Q_WS_HILDON
-        fnt.setPointSize ( 10 );
-#else
         fnt.setPointSize ( 9 );
-#endif
     this->setFont ( fnt );
     this->hide();
 
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 2db355b..a50d236 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -308,23 +308,6 @@ ConfigDialog::ConfigDialog ( QWidget * parent,  Qt::WindowFlags f )
                                 "/32x32/edit_settings.png" ) ) );
     setWindowTitle ( tr ( "Settings" ) );
 
-#ifdef Q_WS_HILDON
-    QFont fnt=font();
-    fnt.setPointSize ( 10 );
-    setFont ( fnt );
-    QSize sz=ok->sizeHint();
-    sz.setWidth ( ( int ) ( sz.width() /1.5 ) );
-    sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
-    ok->setFixedSize ( sz );
-    sz=cancel->sizeHint();
-    sz.setWidth ( ( int ) ( sz.width() ) );
-    sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
-    cancel->setFixedSize ( sz );
-    clientSshPort->setFixedHeight (
-        int ( clientSshPort->sizeHint().height() *1.5 ) );
-    defaults->hide();
-#endif
-
     pwid=new PrintWidget ( this );
     tabWidg->addTab ( pwid,tr ( "Printing" ) );
 
diff --git a/src/connectionwidget.cpp b/src/connectionwidget.cpp
index d04bd39..92ec121 100644
--- a/src/connectionwidget.cpp
+++ b/src/connectionwidget.cpp
@@ -35,14 +35,8 @@ ConnectionWidget::ConnectionWidget ( QString id, ONMainWindow * mw,
 		: ConfigWidget ( id,mw,parent,f )
 {
 	QVBoxLayout *connLay=new QVBoxLayout ( this );
-#ifndef Q_WS_HILDON
 	QGroupBox* netSpd=new QGroupBox ( tr ( "&Connection speed" ),this );
 	QVBoxLayout *spdLay=new QVBoxLayout ( netSpd );
-#else
-	QFrame* netSpd=this ;
-	QVBoxLayout *spdLay=new QVBoxLayout ();
-	spdLay->addWidget ( new QLabel ( tr ( "Connection speed:" ),netSpd ) );
-#endif
 	spd=new QSlider ( Qt::Horizontal,netSpd );
 	spd->setMinimum ( 0 );
 	spd->setMaximum ( 4 );
@@ -70,28 +64,16 @@ ConnectionWidget::ConnectionWidget ( QString id, ONMainWindow * mw,
 	slideLay->insertSpacing ( 0,fm.width ( "MODEM" ) /2 );
 	slideLay->addSpacing ( fm.width ( "LAN" ) /2 );
 
-#ifndef Q_WS_HILDON
 	QGroupBox* compr=new QGroupBox ( tr ( "C&ompression" ),this );
 	QHBoxLayout* comprLay=new QHBoxLayout ( compr );
-#else
-	QFrame* compr=this;
-	QHBoxLayout* comprLay=new QHBoxLayout ();
-#endif
 	packMethode = new QComboBox ( this );
 	quali= new QSpinBox ( this );
 	quali->setRange ( 0,9 );
-#ifdef Q_WS_HILDON
-	quali->setFixedHeight ( int ( quali->sizeHint().height() *1.5 ) );
-#endif
 
 	QVBoxLayout* colLay=new QVBoxLayout();
 	QVBoxLayout* cowLay=new QVBoxLayout();
 	QHBoxLayout* spbl=new QHBoxLayout();
-#ifndef Q_WS_HILDON
 	colLay->addWidget ( new QLabel ( tr ( "Method:" ),compr ) );
-#else
-	colLay->addWidget ( new QLabel ( tr ( "Compression method:" ),compr ) );
-#endif
 	colLay->addWidget ( qualiLabel=new QLabel ( tr ( "Image quality:" ),
 	        compr ) );
 	cowLay->addWidget ( packMethode );
@@ -100,13 +82,8 @@ ConnectionWidget::ConnectionWidget ( QString id, ONMainWindow * mw,
 	cowLay->addLayout ( spbl );
 	comprLay->addLayout ( colLay );
 	comprLay->addLayout ( cowLay );
-#ifndef Q_WS_HILDON
 	connLay->addWidget ( netSpd );
 	connLay->addWidget ( compr );
-#else
-	connLay->addLayout ( spdLay );
-	connLay->addLayout ( comprLay );
-#endif
 	connLay->addStretch();
 
 	connect ( packMethode,SIGNAL ( activated ( const QString& ) ),this,
diff --git a/src/editconnectiondialog.cpp b/src/editconnectiondialog.cpp
index 27296b9..ceca95a 100644
--- a/src/editconnectiondialog.cpp
+++ b/src/editconnectiondialog.cpp
@@ -34,20 +34,13 @@ EditConnectionDialog::EditConnectionDialog ( bool newSession, QString id, QWidge
         : QDialog ( par,f )
 {
     QVBoxLayout* ml=new QVBoxLayout ( this );
-#ifdef Q_WS_HILDON
-    ml->setMargin ( 2 );
-#endif
     fr=new QTabWidget ( this );
     ml->addWidget ( fr );
     ONMainWindow* parent= ( ONMainWindow* ) par;
 
     QFont fnt=font();
     if ( parent->retMiniMode() )
-#ifdef Q_WS_HILDON
-        fnt.setPointSize ( 10 );
-#else
         fnt.setPointSize ( 9 );
-#endif
     setFont ( fnt );
 
     sessSet=new SessionWidget ( newSession, id,parent );
@@ -73,9 +66,6 @@ EditConnectionDialog::EditConnectionDialog ( bool newSession, QString id, QWidge
     bLay->addWidget ( cancel );
     bLay->addWidget ( def );
     ml->addLayout ( bLay );
-#ifdef Q_WS_HILDON
-    bLay->setMargin ( 2 );
-#endif
 
     setSizeGripEnabled ( true );
     setWindowIcon ( QIcon ( parent->iconsPath ( "/32x32/edit.png" ) ) );
@@ -94,20 +84,6 @@ EditConnectionDialog::EditConnectionDialog ( bool newSession, QString id, QWidge
 #endif
 
     ok->setDefault ( true );
-#ifdef Q_WS_HILDON
-    QSize sz=ok->sizeHint();
-    sz.setWidth ( ( int ) ( sz.width() /1.5 ) );
-    sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
-    ok->setFixedSize ( sz );
-    sz=cancel->sizeHint();
-    sz.setWidth ( ( int ) ( sz.width() ) );
-    sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
-    cancel->setFixedSize ( sz );
-    sz=def->sizeHint();
-    sz.setWidth ( ( int ) ( sz.width() ) );
-    sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
-    def->setFixedSize ( sz );
-#endif
     if ( parent->retMiniMode() )
         setContentsMargins ( 3,3,3,3 );
     fr->setCurrentIndex ( ind );
diff --git a/src/folderbutton.cpp b/src/folderbutton.cpp
index 9f2211f..731aae0 100644
--- a/src/folderbutton.cpp
+++ b/src/folderbutton.cpp
@@ -52,11 +52,7 @@ FolderButton::FolderButton ( ONMainWindow* mw,QWidget *parent, QString folderPat
 
     QFont fnt=font();
     if ( mw->retMiniMode() )
-#ifdef Q_WS_HILDON
-        fnt.setPointSize ( 10 );
-#else
         fnt.setPointSize ( 9 );
-#endif
     setFont ( fnt );
     setFocusPolicy ( Qt::NoFocus );
     bool miniMode=mw->retMiniMode();
diff --git a/src/mediawidget.cpp b/src/mediawidget.cpp
index e204bcd..78a91ba 100644
--- a/src/mediawidget.cpp
+++ b/src/mediawidget.cpp
@@ -38,13 +38,7 @@ MediaWidget::MediaWidget ( QString id, ONMainWindow * mw,
                            QWidget * parent, Qt::WindowFlags f )
     : ConfigWidget ( id,mw,parent,f )
 {
-#ifdef Q_WS_HILDON
-    QTabWidget* tabSettings=new QTabWidget ( this );
-    QFrame* sbgr=new QFrame();
-    tabSettings->addTab ( sbgr,tr ( "Sound" ) );
-#else
     sbgr=new QGroupBox ( tr ( "Sound" ),this );
-#endif
     QVBoxLayout *sndLay=new QVBoxLayout ( sbgr );
     QHBoxLayout* sLay=new QHBoxLayout ( );
     QVBoxLayout* sLay_sys=new QVBoxLayout ( );
diff --git a/src/ongetpass.cpp b/src/ongetpass.cpp
index 6e8c4ee..8405ad4 100644
--- a/src/ongetpass.cpp
+++ b/src/ongetpass.cpp
@@ -51,14 +51,12 @@ int x2goMain ( int argc, char *argv[] )
 {
     QApplication app ( argc,argv );
 
-#ifndef Q_WS_HILDON
 #ifdef Q_OS_LINUX
 #if QT_VERSION < 0x050000
     app.setStyle ( new QPlastiqueStyle() );
 #else
     app.setStyle ("fusion");
 #endif
-#endif
 #endif
     QStringList args;
     if ( argc > 1 )
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index e63dcc5..af473de 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -401,7 +401,6 @@ void ONMainWindow::initUI()
     setCentralWidget ( fr );
 
 
-#ifndef Q_WS_HILDON
 
     // See if BGFile is a directory and retrieve an SVG file randomly from within
     QFileInfo bg_dir(BGFile);
@@ -431,9 +430,6 @@ void ONMainWindow::initUI()
             bgFrame=new SVGFrame ( ( QString ) images_resource_path("/svg/bg.svg"),true,fr );
         }
     }
-#else
-    bgFrame=new SVGFrame ( ( QString ) images_resource_path("/svg/bg_hildon.svg"),true,fr );
-#endif
     //bgFrame=new SVGFrame((QString)"/home/admin/test.svg",false,fr);
 
     QString x2gologopath=images_resource_path("/svg/x2gologo.svg");
@@ -838,12 +834,10 @@ void ONMainWindow::initWidgetsNormal()
     u->hide();
     QFont fnt=u->font();
     fnt.setPointSize ( 16 );
-#ifndef Q_WS_HILDON
     if ( miniMode )
     {
         fnt.setPointSize ( 12 );
     }
-#endif
 
     u->setFont ( fnt );
 
@@ -978,7 +972,7 @@ void ONMainWindow::initWidgetsNormal()
         {
             menu_sess->addAction ( act_new );
             menu_sess->addAction ( act_edit );
-#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN)
+#if (!defined Q_OS_DARWIN)
             if ( !portable )
                 menu_sess->addAction ( act_sessicon );
 #endif
@@ -1005,7 +999,7 @@ void ONMainWindow::initWidgetsNormal()
         {
             stb->addAction ( act_new );
             stb->addAction ( act_edit );
-#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN)
+#if (!defined Q_OS_DARWIN)
             if ( !portable )
                 stb->addAction ( act_sessicon );
 #endif
@@ -6992,18 +6986,6 @@ void ONMainWindow::slotProxyStderr()
             runCommand();
             newSession=false;
         }
-#ifdef 	Q_WS_HILDON
-        else
-        {
-            if ( !xmodExecuted )
-            {
-                xmodExecuted=true;
-                QTimer::singleShot (
-                    2000, this,
-                    SLOT ( slotExecXmodmap() ) );
-            }
-        }
-#endif
     }
     if ( reserr.indexOf (
                 tr ( "Connection timeout, aborting" ) ) !=-1 )
@@ -7448,10 +7430,6 @@ void ONMainWindow::runCommand()
                                         QString,
                                         int )), true);
     }
-#ifdef Q_WS_HILDON
-    //wait 5 seconds and execute xkbcomp
-    QTimer::singleShot ( 5000, this, SLOT ( slotExecXmodmap() ) );
-#endif
 }
 
 
@@ -10188,51 +10166,6 @@ void ONMainWindow::addToAppNames ( QString intName, QString transName )
 
 void ONMainWindow::slotExecXmodmap()
 {
-#ifdef Q_WS_HILDON
-    QString passwd=getCurrentPass();
-    QString user=getCurrentUname();
-    QString host=resumingSession.server;
-    QString cmd;
-
-    cmd="(xmodmap -pke ;"
-        "echo keycode 73= ;"
-// 	    "echo clear shift ;"
-// 	    "echo clear lock ;"
-// 	    "echo clear control ;"
-// 	    "echo clear mod1 ;"
-// 	    "echo clear mod2 ;"
-// 	    "echo clear mod3 ;"
-// 	    "echo clear mod4 ;"
-// 	    "echo clear mod5 ;"
-//  	    "echo add shift = Shift_L ;"
-        "echo add control = Control_R "
-//  	    "echo add mod5 = ISO_Level3_Shift"
-        ")| DISPLAY=:"
-        +resumingSession.display+" xmodmap - ";
-
-    x2goDebug<<"Executing xmodmap with cmd: "<<cmd;
-
-    SshProcess* xmodProc;
-    try
-    {
-        xmodProc=new SshProcess ( this,user,host,sshPort,
-                                  cmd,
-                                  passwd,currentKey,acceptRsa );
-    }
-    catch ( QString message )
-    {
-        return;
-    }
-
-    if ( cardReady /*|| useSshAgent*/ )
-    {
-        QStringList env=xmodProc->environment();
-        env+=sshEnv;
-        xmodProc->setEnvironment ( env );
-    }
-    xmodProc->setFwX ( true );
-    xmodProc->startNormal();
-#endif
 }
 
 void ONMainWindow::check_cmd_status()
@@ -10461,9 +10394,7 @@ void ONMainWindow::startX2goMount()
 
 
     QString cuser;
-#ifdef Q_WS_HILDON
-    cuser="user";
-#elif defined (Q_OS_WIN)
+#if defined (Q_OS_WIN)
     cuser=wapiGetUserName();
 #else
     for ( int i=0; i<env.size(); ++i )
@@ -12611,11 +12542,7 @@ void ONMainWindow::initPassDlg()
 
     QFont fnt=passForm->font();
     if ( miniMode )
-#ifdef Q_WS_HILDON
-        fnt.setPointSize ( 10 );
-#else
         fnt.setPointSize ( 9 );
-#endif
     passForm->setFont ( fnt );
 
     fotoLabel=new QLabel ( passForm );
@@ -12696,19 +12623,8 @@ void ONMainWindow::initPassDlg()
 
 
 
-#ifndef Q_WS_HILDON
     ok->setFixedSize ( ok->sizeHint() );
     cancel->setFixedSize ( cancel->sizeHint() );
-#else
-    QSize sz=cancel->sizeHint();
-    sz.setWidth ( ( int ) ( sz.width() /1.5 ) );
-    sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
-    cancel->setFixedSize ( sz );
-    sz=ok->sizeHint();
-    sz.setWidth ( ( int ) ( sz.width() /1.5 ) );
-    sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
-    ok->setFixedSize ( sz );
-#endif
 
     QVBoxLayout *layout=new QVBoxLayout ( passForm );
     QHBoxLayout *labelLay=new QHBoxLayout();
@@ -12798,11 +12714,7 @@ void ONMainWindow::initStatusDlg()
         sessionStatusDlg->setFixedSize ( 310,200 );
     QFont fnt=sessionStatusDlg->font();
     if ( miniMode )
-#ifdef Q_WS_HILDON
-        fnt.setPointSize ( 10 );
-#else
         fnt.setPointSize ( 9 );
-#endif
     sessionStatusDlg->setFont ( fnt );
     username->addWidget ( sessionStatusDlg );
     QPalette pal=sessionStatusDlg->palette();
@@ -13000,11 +12912,7 @@ void ONMainWindow::initSelectSessDlg()
 
     QFont fnt=selectSessionDlg->font();
     if ( miniMode )
-#ifdef Q_WS_HILDON
-        fnt.setPointSize ( 10 );
-#else
         fnt.setPointSize ( 9 );
-#endif
     selectSessionDlg->setFont ( fnt );
     selectSessionLabel=new QLabel ( tr ( "Select session:" ),
                                     selectSessionDlg );
@@ -13057,29 +12965,8 @@ void ONMainWindow::initSelectSessDlg()
               SLOT ( slotCloseSelectDlg() ) );
 
     selectSessionDlg->show();
-#ifndef Q_WS_HILDON
     sOk->setFixedSize ( ok->sizeHint() );
     sCancel->setFixedSize ( cancel->sizeHint() );
-#else
-    QSize sz=sCancel->sizeHint();
-    sz.setWidth ( ( int ) ( sz.width() /1.5 ) );
-    sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
-    sCancel->setFixedSize ( sz );
-    sz=sOk->sizeHint();
-    sz.setWidth ( ( int ) ( sz.width() /1.5 ) );
-    sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
-    sOk->setFixedSize ( sz );
-    sz=bSusp->sizeHint();
-    if ( bTerm->sizeHint().width() > sz.width() )
-        sz=bTerm->sizeHint();
-    if ( bNew->sizeHint().width() > sz.width() )
-        sz=bNew->sizeHint();
-    sz.setWidth ( ( int ) ( sz.width() /1.5 ) );
-    sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
-    bSusp->setFixedSize ( sz );
-    bTerm->setFixedSize ( sz );
-    bNew->setFixedSize ( sz );
-#endif
     int bmaxw=bNew->size().width();
     if ( bSusp->size().width() >bmaxw )
         bmaxw=bSusp->size().width();
diff --git a/src/printprocess.cpp b/src/printprocess.cpp
index 92e8549..9fa2b02 100644
--- a/src/printprocess.cpp
+++ b/src/printprocess.cpp
@@ -22,7 +22,7 @@
 #include "x2gosettings.h"
 #include <QDir>
 #include "printdialog.h"
-#if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON)
+#if (!defined Q_OS_WIN)
 #include "cupsprint.h"
 #else
 #include "printwidget.h"
@@ -123,13 +123,6 @@ bool PrintProcess::loadSettings()
 	winX2goPrinter=
 	    st.setting()->value ( "print/defaultprinter",
 	               wapiGetDefaultPrinter() ).toString();
-#endif
-#ifdef Q_WS_HILDON
-	pdfOpenCmd="run-standalone.sh dbus-send --print-reply"
-	           " --dest=com.nokia.osso_pdfviewer "
-	           "/com/nokia/osso_pdfviewer "
-	           "com.nokia.osso_pdfviewer.mime_open string:file://";
-	viewPdf=true;
 #endif
 	return true;
 
@@ -142,11 +135,7 @@ void PrintProcess::openPdf()
 	if ( pdfOpen )
 	{
 #ifndef Q_OS_WIN
-#ifndef Q_WS_HILDON
 		QString cmd=pdfOpenCmd+" \""+pdfFile+"\"";
-#else
-		QString cmd=pdfOpenCmd+"\""+pdfFile+"\"";
-#endif
 		x2goDebug<<"Using PDF viewer command: "<<cmd;
 		if ( ! QProcess::startDetached ( cmd ) )
 			slot_error ( QProcess::FailedToStart );
@@ -178,7 +167,6 @@ void PrintProcess::openPdf()
 
 void PrintProcess::print()
 {
-#ifndef Q_WS_HILDON
 	if ( !customPrintCmd )
 	{
 #ifndef Q_OS_WIN
@@ -194,7 +182,6 @@ void PrintProcess::print()
 #endif
 	}
 	else
-#endif //Q_WS_HILDON
 	{
 		if ( !printPs )
 		{
diff --git a/src/printwidget.cpp b/src/printwidget.cpp
index 940c0f1..33a0780 100644
--- a/src/printwidget.cpp
+++ b/src/printwidget.cpp
@@ -16,7 +16,7 @@
 ***************************************************************************/
 
 #include "printwidget.h"
-#if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON)
+#if (!defined Q_OS_WIN)
 #include "cupsprintwidget.h"
 #endif
 #include "printercmddialog.h"
@@ -34,16 +34,7 @@ PrintWidget::PrintWidget ( QWidget* parent )
 	ui.rbPrint->setChecked ( true );
 	ui.gbView->setVisible ( false );
 	QVBoxLayout* lay= ( QVBoxLayout* ) ui.gbPrint->layout();
-#if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON)
-	ui.cbWinPrinter->hide();
-	ui.lWinPrinter->hide();
-	ui.lWinInfo->hide();
-	pwid=new CUPSPrintWidget ( ui.gbPrint );
-	lay->insertWidget ( 0,pwid );
-	connect ( ui.cbPrintCmd,SIGNAL ( toggled ( bool ) ),pwid,
-	          SLOT ( setDisabled ( bool ) ) );
-#else
-#ifdef Q_OS_WIN
+#if defined (Q_OS_WIN)
 	connect ( ui.cbPrintCmd,SIGNAL ( toggled ( bool ) ),ui.cbWinPrinter,
 	          SLOT ( setDisabled ( bool ) ) );
 	connect ( ui.cbPrintCmd,SIGNAL ( toggled ( bool ) ),ui.lWinPrinter,
@@ -70,7 +61,14 @@ PrintWidget::PrintWidget ( QWidget* parent )
 	rtfm->setWordWrap ( true );
 	rtfm->setOpenExternalLinks ( true );
 	lay->insertWidget ( 6,rtfm );
-#endif
+#else
+	ui.cbWinPrinter->hide();
+	ui.lWinPrinter->hide();
+	ui.lWinInfo->hide();
+	pwid=new CUPSPrintWidget ( ui.gbPrint );
+	lay->insertWidget ( 0,pwid );
+	connect ( ui.cbPrintCmd,SIGNAL ( toggled ( bool ) ),pwid,
+	          SLOT ( setDisabled ( bool ) ) );
 #endif
 	connect ( ui.pbPrintCmd,SIGNAL ( clicked() ),this,
 	          SLOT ( slot_editPrintCmd() ) );
@@ -85,13 +83,6 @@ PrintWidget::PrintWidget ( QWidget* parent )
 	ui.label->hide();
 	ui.leOpenCmd->hide();
 #endif
-#ifdef Q_WS_HILDON
-	ui.rbView->setChecked ( true );
-	ui.rbPrint->hide();
-	ui.rbView->hide();
-	ui.label->hide();
-	ui.leOpenCmd->hide();
-#endif
 }
 
 
@@ -190,8 +181,7 @@ void PrintWidget::saveSettings()
 #ifdef Q_OS_WIN
 	st.setting()->setValue ( "print/defaultprinter",
 	              QVariant ( ui.cbWinPrinter->currentText()) );	
-#endif
-#if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON)
+#else
 	pwid->savePrinter();
 #endif
 }
diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp
index d0c50fb..a2decf5 100644
--- a/src/sessionbutton.cpp
+++ b/src/sessionbutton.cpp
@@ -63,11 +63,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
 
     QFont fnt=font();
     if ( mw->retMiniMode() )
-#ifdef Q_WS_HILDON
-        fnt.setPointSize ( 10 );
-#else
         fnt.setPointSize ( 9 );
-#endif
     setFont ( fnt );
     setFocusPolicy ( Qt::NoFocus );
     bool miniMode=mw->retMiniMode();
@@ -169,7 +165,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
                  QIcon (
                      mw->iconsPath ( "/16x16/edit.png" ) ),
                  tr ( "Session preferences ..." ) );
-#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN)
+#if (!defined Q_OS_DARWIN)
     act_createIcon=sessMenu->addAction (
                        QIcon ( mw->iconsPath ( "/16x16/create_file.png" ) ),
                        tr (
@@ -185,7 +181,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
 
     connect ( act_remove,SIGNAL ( triggered ( bool ) ),this,
               SLOT ( slotRemove() ) );
-#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN)
+#if (!defined Q_OS_DARWIN)
     connect ( act_createIcon,SIGNAL ( triggered ( bool ) ),this,
               SLOT ( slotCreateSessionIcon() ) );
 #endif
@@ -637,16 +633,12 @@ void SessionButton::redraw()
 
 
         }
-#ifndef Q_WS_HILDON
 
 
     geomBox->addItem ( "1440x900" );
     geomBox->addItem ( "1280x1024" );
     geomBox->addItem ( "1024x768" );
     geomBox->addItem ( "800x600" );
-#else
-    geomBox->addItem ( tr ( "window" ) );
-#endif
     if ( st->setting()->value ( sid+"/fullscreen",
                                 ( QVariant ) false ).toBool() )
     {
@@ -674,7 +666,6 @@ void SessionButton::redraw()
     }
     else
     {
-#ifndef	Q_WS_HILDON
         QString g=QString::number ( st->setting()->value (
                                         sid+"/width" ).toInt() );
         g+="x"+QString::number ( st->setting()->value (
@@ -683,10 +674,6 @@ void SessionButton::redraw()
         if ( geomBox->findText ( g ) ==-1 )
             geomBox->addItem ( g );
         geomBox->setCurrentIndex ( geomBox->findText ( g ) );
-#else
-        geom->setText ( tr ( "window" ) );
-        geomBox->setCurrentIndex ( 1 );
-#endif
     }
 
     if (directRDP)
@@ -1086,9 +1073,6 @@ void SessionButton::slot_geom_change ( const QString& new_g )
     else
     {
         QString new_geom=new_g;
-#ifdef Q_WS_HILDON
-        new_geom="800x600";
-#endif
         st.setting()->setValue ( sid+"/fullscreen", ( QVariant ) false );
         st.setting()->setValue ( sid+"/multidisp", ( QVariant ) false );
         st.setting()->setValue ( sid+"/maxdim", ( QVariant ) false );
diff --git a/src/sessionmanagedialog.cpp b/src/sessionmanagedialog.cpp
index 02f749e..3deabdc 100644
--- a/src/sessionmanagedialog.cpp
+++ b/src/sessionmanagedialog.cpp
@@ -53,7 +53,7 @@ SessionManageDialog::SessionManageDialog ( QWidget * parent,
     QPushButton* newSession=new QPushButton ( tr ( "&New session" ),fr );
     editSession=new QPushButton ( tr ( "&Session preferences" ),fr );
     removeSession=new QPushButton ( tr ( "&Delete session" ),fr );
-#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN)
+#if (!defined Q_OS_DARWIN)
     if ( !ONMainWindow::getPortable() )
         createSessionIcon=new QPushButton (
             tr ( "&Create session icon on desktop ..." ),fr );
@@ -63,7 +63,7 @@ SessionManageDialog::SessionManageDialog ( QWidget * parent,
                               par->iconsPath ( "/16x16/new_file.png" ) ) );
     editSession->setIcon ( QIcon (
                                par->iconsPath ( "/16x16/edit.png" ) ) );
-#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN)
+#if (!defined Q_OS_DARWIN)
     if ( !ONMainWindow::getPortable() )
         createSessionIcon->setIcon (
             QIcon ( par->iconsPath ( "/16x16/create_file.png" ) ) );
@@ -75,7 +75,7 @@ SessionManageDialog::SessionManageDialog ( QWidget * parent,
     actLay->addWidget ( newSession );
     actLay->addWidget ( editSession );
     actLay->addWidget ( removeSession );
-#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN)
+#if (!defined Q_OS_DARWIN)
     if ( !ONMainWindow::getPortable() )
         actLay->addWidget ( createSessionIcon );
 #endif
@@ -97,7 +97,7 @@ SessionManageDialog::SessionManageDialog ( QWidget * parent,
     connect (
         removeSession,SIGNAL ( clicked() ),this,SLOT ( slot_delete() ) );
     connect ( editSession,SIGNAL ( clicked() ),this,SLOT ( slot_edit() ) );
-#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN)
+#if (!defined Q_OS_DARWIN)
     if ( !ONMainWindow::getPortable() )
         connect ( createSessionIcon,SIGNAL ( clicked() ),
                   this,SLOT ( slot_createSessionIcon() ) );
@@ -146,7 +146,7 @@ void SessionManageDialog::loadSessions()
 
     removeSession->setEnabled ( false );
     editSession->setEnabled ( false );
-#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN)
+#if (!defined Q_OS_DARWIN)
     if ( !ONMainWindow::getPortable() )
         createSessionIcon->setEnabled ( false );
 #endif
@@ -216,7 +216,7 @@ void SessionManageDialog::slot_endisable ( QTreeWidgetItem* item, int col)
 
     removeSession->setEnabled ( isSess );
     editSession->setEnabled ( isSess );
-#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN)
+#if (!defined Q_OS_DARWIN)
     if ( !ONMainWindow::getPortable() )
         createSessionIcon->setEnabled ( isSess );
 #endif
diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp
index bef37e3..1c22942 100644
--- a/src/sessionwidget.cpp
+++ b/src/sessionwidget.cpp
@@ -43,9 +43,6 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw,
     : ConfigWidget ( id,mw,parent,f )
 {
     QVBoxLayout* sessLay=new QVBoxLayout ( this );
-#ifdef Q_WS_HILDON
-    sessLay->setMargin ( 2 );
-#endif
     this->parent=mw;
     this->newSession=newSession;
 
@@ -79,11 +76,7 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw,
     pathLay->addWidget(lPath,1);
     pathLay->addWidget(pathButton,0);
 
-#ifndef Q_WS_HILDON
     QGroupBox *sgb=new QGroupBox ( tr ( "&Server" ),this );
-#else
-    QFrame* sgb=this;
-#endif
     const QString ssh_port_tooltip_text = tr ("Values ranging from <b>0</b> to <b>65535</b> are allowed."
                                               "<br />A value of <b>0</b> will either use the port specified in the "
                                               "SSH configuration file belonging to a host or shortname, "
@@ -104,18 +97,11 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw,
 #endif
     key=new QLineEdit ( sgb );
 
-#ifndef Q_WS_HILDON
     openKey=new QPushButton (
         QIcon ( mainWindow->iconsPath (
                     "/32x32/file-open.png" ) ),
         QString::null,sgb );
     QVBoxLayout *sgbLay = new QVBoxLayout ( sgb );
-#else
-    QPushButton* openKey=new QPushButton (
-        QIcon ( mainWindow->iconsPath ( "/16x16/file-open.png" ) ),
-        QString::null,sgb );
-    QVBoxLayout *sgbLay = new QVBoxLayout ();
-#endif
     QHBoxLayout *suLay =new QHBoxLayout();
     QVBoxLayout *slLay =new QVBoxLayout();
     QVBoxLayout *elLay =new QVBoxLayout();
@@ -132,9 +118,6 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw,
 #endif
     suLay->addLayout ( slLay );
     suLay->addLayout ( elLay );
-#ifdef Q_WS_HILDON
-    sshPort->setFixedHeight ( int ( sshPort->sizeHint().height() *1.5 ) );
-#endif
 
     QHBoxLayout *keyLay =new QHBoxLayout();
     lKey=new QLabel ( tr ( "Use RSA/DSA key for ssh connection:" ),sgb );
@@ -199,14 +182,8 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw,
     proxyLaout->addWidget(cbProxyKrbLogin,5,3,1,3);
 
 
-#ifndef Q_WS_HILDON
     QGroupBox *deskSess=new QGroupBox ( tr ( "&Session type" ),this );
     QGridLayout* cmdLay=new QGridLayout ( deskSess );
-#else
-    QFrame* deskSess=this;
-    QHBoxLayout* cmdLay=new QHBoxLayout ();
-    cmdLay->addWidget ( new QLabel ( tr ( "Session type:" ),this ) );
-#endif
     cbKdrive=new QCheckBox(tr("Run in X2GoKDrive (experimental)"));
     sessBox=new QComboBox ( deskSess );
     cmd=new QLineEdit ( deskSess );
@@ -246,7 +223,6 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw,
     cmdCombo->addItems ( mainWindow->transApplicationsNames() );
     cmdCombo->lineEdit()->setText ( tr ( "Path to executable" ) );
     cmdCombo->lineEdit()->selectAll();
-#ifndef Q_WS_HILDON
     sessLay->addLayout ( slay );
     sessLay->addLayout ( ilay );
     sessLay->addLayout ( pathLay );
@@ -261,24 +237,6 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw,
     connect(cbDirectRDP,SIGNAL(clicked()), this, SLOT(slot_rdpDirectClicked()));
 #endif
 
-#else
-    QVBoxLayout* sHildILay = new QVBoxLayout();
-    sHildILay->addLayout ( slay );
-    sHildILay->addLayout ( ilay );
-    sHildILay->addStretch();
-    QHBoxLayout* sHildLay = new QHBoxLayout();
-    sHildLay->addLayout ( sHildILay );
-
-    QFrame* vl=new QFrame;
-    vl->setLineWidth ( 0 );
-    vl->setFrameStyle ( QFrame::VLine|QFrame::Plain );
-    sHildLay->addWidget ( vl );
-    sHildLay->setSpacing ( 6 );
-    sHildLay->addLayout ( sgbLay );
-    sessLay->addLayout ( sHildLay );
-    sessLay->addStretch();
-    sessLay->addLayout ( cmdLay );
-#endif
     sessLay->addStretch();
 
     connect ( icon,SIGNAL ( clicked() ),this,SLOT ( slot_getIcon() ) );
diff --git a/src/settingswidget.cpp b/src/settingswidget.cpp
index 5cca6e6..4c9d91f 100644
--- a/src/settingswidget.cpp
+++ b/src/settingswidget.cpp
@@ -39,17 +39,9 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw,
     : ConfigWidget ( id,mw,parent,f )
 {
     multiDisp=(QApplication::desktop()->screenCount()>1);
-#ifdef Q_WS_HILDON
-    QTabWidget* tabSettings=new QTabWidget ( this );
-    QFrame* dgb=new QFrame();
-    QFrame* kgb=new QFrame();
-    tabSettings->addTab ( dgb, tr ( "&Display" ) );
-    tabSettings->addTab ( kgb,tr ( "&Keyboard" ) );
-#else
     QGroupBox *dgb=new QGroupBox ( tr ( "&Display" ),this );
     clipGr=new QGroupBox ( tr ( "&Clipboard mode" ),this );
     kgb=new QGroupBox ( tr ( "&Keyboard" ),this );
-#endif
     QVBoxLayout *dbLay = new QVBoxLayout ( dgb );
     QVBoxLayout *cbLay=new QVBoxLayout ( clipGr );
     QHBoxLayout* sLay=new QHBoxLayout ( );
@@ -60,11 +52,7 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw,
     QVBoxLayout* setLay=new QVBoxLayout ( this );
     QButtonGroup* radio = new QButtonGroup ( dgb );
     fs=new QRadioButton ( tr ( "Fullscreen" ),dgb );
-#ifndef Q_WS_HILDON
     custom=new QRadioButton ( tr ( "Custom" ),dgb );
-#else
-    custom=new QRadioButton ( tr ( "Window" ),dgb );
-#endif
     display=new QRadioButton ( tr ( "Use whole display" ),dgb );
     cbNoresize=new QCheckBox ( tr ( "Not resizable" ),dgb );
     maxRes=new QRadioButton ( tr ( "Maximum available" ),dgb );
@@ -142,12 +130,6 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw,
     dbLay->addWidget ( dhl );
     dbLay->addWidget ( cbXinerama );
 
-#ifdef Q_WS_HILDON
-    width->hide();
-    height->hide();
-    widthLabel->hide();
-    heightLabel->hide();
-#endif
 
 #ifdef Q_OS_DARWIN
     kgb->hide();
@@ -197,7 +179,6 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw,
     kbLay->addWidget ( rbKbdSet);
     kbLay->addWidget( gbKbdString );
 
-#ifndef Q_WS_HILDON
     setLay->addWidget ( dgb );
     setLay->addWidget ( clipGr );
     setLay->addWidget ( kgb );
@@ -258,10 +239,6 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw,
     connect (xdmcpParams, SIGNAL(textChanged(QString)), this, SLOT(updateCmdLine()));
 #endif //CFGCLIENT
 #endif //Q_OS_LINUX
-#else
-    setLay->addWidget ( tabSettings );
-// 	cbClientPrint->hide();
-#endif //Q_WS_HILDON
     setLay->addStretch();
 
     connect ( custom,SIGNAL ( toggled ( bool ) ),width,
diff --git a/src/sharewidget.cpp b/src/sharewidget.cpp
index bd9e337..76d9aad 100644
--- a/src/sharewidget.cpp
+++ b/src/sharewidget.cpp
@@ -63,14 +63,6 @@ ShareWidget::ShareWidget ( QString id, ONMainWindow * mw,
 
     QPushButton* addDir=new QPushButton ( tr ( "Add" ),egb );
     QPushButton* delDir=new QPushButton ( tr ( "Delete" ),egb );
-#ifdef Q_WS_HILDON
-    QSize sz=addDir->sizeHint();
-    sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
-    addDir->setFixedSize ( sz );
-    sz=delDir->sizeHint();
-    sz.setHeight ( ( int ) ( sz.height() /1.5 ) );
-    delDir->setFixedSize ( sz );
-#endif
 
     QLabel *dirPrompt=new QLabel ( tr ( "Path:" ),egb );
     dirPrompt->setFixedSize ( dirPrompt->sizeHint() );
diff --git a/src/x2goclientconfig.h b/src/x2goclientconfig.h
index 3bb9aeb..ced8590 100644
--- a/src/x2goclientconfig.h
+++ b/src/x2goclientconfig.h
@@ -36,8 +36,4 @@
 #undef USELDAP
 #endif
 
-#if defined Q_WS_HILDON
-#undef USELDAP
-#endif
-
 #endif

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list