From f14fbb60ccf8cfc42cfca418cde622e9433770eb Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Tue, 11 May 2010 00:13:40 +0000 Subject: [PATCH] 2010-05-10 17:10 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbide/ideenviron.prg * contrib/hbide/idefindreplace.prg * contrib/hbide/ideprojmanager.prg * contrib/hbide/resources/environments.ui * contrib/hbide/resources/environments.uic % Tooltips shifted to WhatsThis slot ( Sh+F1 to view ). + Applied: monospaced font "Courier" to input fields and text boxes. --- harbour/ChangeLog | 9 +++++++++ harbour/contrib/hbide/ideenviron.prg | 4 ++++ harbour/contrib/hbide/idefindreplace.prg | 2 +- harbour/contrib/hbide/ideprojmanager.prg | 14 ++++++++++++++ harbour/contrib/hbide/resources/environments.ui | 5 ++++- .../contrib/hbide/resources/environments.uic | 17 ++++++++++------- 6 files changed, 42 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 68a0e8d015..e391017911 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,15 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-05-10 17:10 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbide/ideenviron.prg + * contrib/hbide/idefindreplace.prg + * contrib/hbide/ideprojmanager.prg + * contrib/hbide/resources/environments.ui + * contrib/hbide/resources/environments.uic + % Tooltips shifted to WhatsThis slot ( Sh+F1 to view ). + + Applied: monospaced font "Courier" to input fields and text boxes. + 2010-05-10 21:47 UTC+0200 Xavi (jarabal/at/gmail.com) * config/postinst.prg % Corrected tipo. diff --git a/harbour/contrib/hbide/ideenviron.prg b/harbour/contrib/hbide/ideenviron.prg index e46cf5fa6a..d37a6a0c27 100644 --- a/harbour/contrib/hbide/ideenviron.prg +++ b/harbour/contrib/hbide/ideenviron.prg @@ -233,6 +233,10 @@ METHOD IdeEnvironments:show() ::oUI:signal( "buttonSaveExit", "clicked()", {|| ::saveEnv(), ::oEnvironDock:hide() } ) ::oUI:signal( "buttonPathMk2" , "clicked()", {|| ::execEnv( 1 ) } ) ::oUI:signal( "buttonPathEnv" , "clicked()", {|| ::execEnv( 2 ) } ) + + ::oUI:q_editCompilers:setFont( ::oFont:oWidget ) + ::oUI:q_editPathEnv:setFont( ::oFont:oWidget ) + ::oUI:q_editPathMk2:setFont( ::oFont:oWidget ) ENDIF ::oUI:q_editPathMk2 :setText( ::aINI[ INI_HBIDE, PathMk2 ] ) diff --git a/harbour/contrib/hbide/idefindreplace.prg b/harbour/contrib/hbide/idefindreplace.prg index a1075a299c..f80ddbde2d 100644 --- a/harbour/contrib/hbide/idefindreplace.prg +++ b/harbour/contrib/hbide/idefindreplace.prg @@ -689,7 +689,7 @@ METHOD IdeFindInFiles:buildUI() ::oUI:q_editResults:setReadOnly( .t. ) //::oUI:q_editResults:setFontFamily( "Courier New" ) //::oUI:q_editResults:setFontPointSize( 10 ) - //::oUI:q_editResults:setFont( ::oIde:oFont:oWidget ) + ::oUI:q_editResults:setFont( ::oIde:oFont:oWidget ) ::oUI:q_editResults:setContextMenuPolicy( Qt_CustomContextMenu ) ::oUI:q_labelStatus:setText( "Ready" ) diff --git a/harbour/contrib/hbide/ideprojmanager.prg b/harbour/contrib/hbide/ideprojmanager.prg index 2233e84d3e..d668b30b87 100644 --- a/harbour/contrib/hbide/ideprojmanager.prg +++ b/harbour/contrib/hbide/ideprojmanager.prg @@ -732,6 +732,20 @@ METHOD IdeProjManager:buildInterface() ::oUI:signal( "editPrjLoctn" , "textChanged(QString)", {|cPath| ::setProjectLocation( cPath ) } ) + /* Set monospaced fonts */ + ::oUI:q_editFlags :setFont( ::oFont:oWidget ) + ::oUI:q_editSources :setFont( ::oFont:oWidget ) + ::oUI:q_editHbp :setFont( ::oFont:oWidget ) + + ::oUI:q_editPrjTitle :setFont( ::oFont:oWidget ) + ::oUI:q_editPrjLoctn :setFont( ::oFont:oWidget ) + ::oUI:q_editWrkFolder :setFont( ::oFont:oWidget ) + ::oUI:q_editDstFolder :setFont( ::oFont:oWidget ) + ::oUI:q_editOutName :setFont( ::oFont:oWidget ) + ::oUI:q_editBackup :setFont( ::oFont:oWidget ) + ::oUI:q_editLaunchParams:setFont( ::oFont:oWidget ) + ::oUI:q_editLaunchExe :setFont( ::oFont:oWidget ) + RETURN Self /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbide/resources/environments.ui b/harbour/contrib/hbide/resources/environments.ui index bd70eff701..91b8ea3e30 100644 --- a/harbour/contrib/hbide/resources/environments.ui +++ b/harbour/contrib/hbide/resources/environments.ui @@ -62,11 +62,14 @@ + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">HBIDE employes the concept of keeping everything tied together. It means all complier specific environments are kept together in a convinient way and applied as per need.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">HBIDE employes the concept of keeping everything tied together. It means all complier specific environments are kept together in a convinient way and applied as per need.</span></p> <p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">So here you view/edit all the environments you employ in your applications. At the time you will build the project, a list of stated environments will be presented to choose from.</span></p> <p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> diff --git a/harbour/contrib/hbide/resources/environments.uic b/harbour/contrib/hbide/resources/environments.uic index e76fe55a82..f49cdfbb17 100644 --- a/harbour/contrib/hbide/resources/environments.uic +++ b/harbour/contrib/hbide/resources/environments.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'environments.ui' ** -** Created: Mon Apr 12 21:21:08 2010 -** by: Qt User Interface Compiler version 4.5.2 +** Created: Mon May 10 16:37:02 2010 +** by: Qt User Interface Compiler version 4.5.3 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -119,17 +119,20 @@ public: labelPathEnv->setText(QApplication::translate("FormEnvironments", "Path to hbide.env", 0, QApplication::UnicodeUTF8)); buttonPathEnv->setText(QString()); #ifndef QT_NO_TOOLTIP - editCompilers->setToolTip(QApplication::translate("FormEnvironments", "\n" + editCompilers->setToolTip(QString()); +#endif // QT_NO_TOOLTIP +#ifndef QT_NO_WHATSTHIS + editCompilers->setWhatsThis(QApplication::translate("FormEnvironments", "\n" "\n" -"

HBIDE employes the concept of keeping everything tied together. It means all complier specific environments are kept together in a convinient way and applied as per need.

\n" +"

HBIDE employes the concept of keeping everything tied together. It means all complier specific environments are kept together in a convinient way and applied as per need.

\n" "

\n" -"

" - "So here you view/edit all the environments you employ in your applications. At the time you will build the project, a list of stated environments will be presented to choose from.

\n" +"

So here you view/edit all the environments you employ in your applications. At the time you will build the project, a list of stated environments will be presented to choose from.

\n" "

\n" "

This opens up the possibility to experiment with different compilers without re-opening the IDE or setting up the envvars manually.

", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP +#endif // QT_NO_WHATSTHIS editCompilers->setStyleSheet(QString()); buttonCn->setText(QApplication::translate("FormEnvironments", "Cancel", 0, QApplication::UnicodeUTF8)); labelPathMk2->setText(QApplication::translate("FormEnvironments", "Path to hbmk2", 0, QApplication::UnicodeUTF8));