Update of /cvsroot/tora/tora In directory sc8-pr-cvs1:/tmp/cvs-serv30508 Modified Files: NEWS main.cpp toabout.cpp tochartalarmui.ui tochartmanager.cpp tochartsetupui.ui toconf.h todatabasesettingui.ui toglobalsettingui.ui tohelp.cpp tolinechart.cpp tomain.cpp tomarkedtext.cpp tomessageui.ui tooracleconnection.cpp topiechart.cpp toresultview.cpp totoolsettingui.ui utils.cpp Log Message: Index: NEWS =================================================================== RCS file: /cvsroot/tora/tora/NEWS,v retrieving revision 1.838 retrieving revision 1.839 diff -C2 -d -r1.838 -r1.839 *** NEWS 8 Apr 2003 07:06:21 -0000 1.838 --- NEWS 8 Apr 2003 08:13:46 -0000 1.839 *************** *** 1,4 **** --- 1,5 ---- 1.3.10: + 2003-04-08: Added define TOAPPNAME for application name and use it where needed. 2003-04-08: Fixed problem with treebased browsing of code. 2003-04-08: Fixed problems with '' in sql parser. Index: main.cpp =================================================================== RCS file: /cvsroot/tora/tora/main.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** main.cpp 10 Feb 2003 23:11:39 -0000 1.63 --- main.cpp 8 Apr 2003 08:13:46 -0000 1.64 *************** *** 113,117 **** #ifndef TOMONOLITHIC { ! toSplash splash(NULL,"About TOra",false); splash.show(); std::list<QString> failed; --- 113,117 ---- #ifndef TOMONOLITHIC { ! toSplash splash(NULL,"About " TOAPPNAME,false); splash.show(); std::list<QString> failed; *************** *** 171,175 **** #ifndef TO_LICENSE if (toTool::globalConfig("LastVersion","")!=TOVERSION) { ! toAbout *about=new toAbout(0,NULL,"About TOra",true); if (!about->exec()) { exit (2); --- 171,175 ---- #ifndef TO_LICENSE if (toTool::globalConfig("LastVersion","")!=TOVERSION) { ! toAbout *about=new toAbout(0,NULL,"About " TOAPPNAME,true); if (!about->exec()) { exit (2); Index: toabout.cpp =================================================================== RCS file: /cvsroot/tora/tora/toabout.cpp,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** toabout.cpp 8 Apr 2003 04:22:14 -0000 1.72 --- toabout.cpp 8 Apr 2003 08:13:47 -0000 1.73 *************** *** 355,359 **** "<DIV ALIGN=LEFT>"; ! #define ABOUT_CAPTION "TOra %1" void toAllocLogo(void) --- 355,359 ---- "<DIV ALIGN=LEFT>"; ! #define ABOUT_CAPTION TOAPPNAME " %1" void toAllocLogo(void) *************** *** 399,403 **** case 1: #ifdef TO_LICENSE ! setCaption(tr("TOra for Windows License")); #else setCaption(tr("GNU General Public License")); --- 399,403 ---- case 1: #ifdef TO_LICENSE ! setCaption(tr("End User License")); #else setCaption(tr("GNU General Public License")); Index: tochartalarmui.ui =================================================================== RCS file: /cvsroot/tora/tora/tochartalarmui.ui,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tochartalarmui.ui 22 Jan 2002 22:15:36 -0000 1.3 --- tochartalarmui.ui 8 Apr 2003 08:13:47 -0000 1.4 *************** *** 322,326 **** <property> <name>toolTip</name> ! <string>Remember this alarm when restarting TOra.</string> </property> </widget> --- 322,326 ---- <property> <name>toolTip</name> ! <string>Remember this alarm when restarting.</string> </property> </widget> Index: tochartmanager.cpp =================================================================== RCS file: /cvsroot/tora/tora/tochartmanager.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tochartmanager.cpp 9 Sep 2002 07:03:44 -0000 1.12 --- tochartmanager.cpp 8 Apr 2003 08:13:47 -0000 1.13 *************** *** 695,699 **** toStatusMessage(tr("ALARM:")+signal.Chart+QString::fromLatin1(": ")+signal.Alarm+QString::fromLatin1(": ")+signal.xValue); else if (signal.Action==Email) ! new toSMTP(QString::fromLatin1("TOra <noreply@localhost>"), signal.Extra, tr("TOra alert:")+" "+signal.Chart, --- 695,699 ---- toStatusMessage(tr("ALARM:")+signal.Chart+QString::fromLatin1(": ")+signal.Alarm+QString::fromLatin1(": ")+signal.xValue); else if (signal.Action==Email) ! new toSMTP(QString::fromLatin1(TOAPPNAME " <noreply@localhost>"), signal.Extra, tr("TOra alert:")+" "+signal.Chart, Index: tochartsetupui.ui =================================================================== RCS file: /cvsroot/tora/tora/tochartsetupui.ui,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tochartsetupui.ui 28 Dec 2001 19:02:47 -0000 1.1 --- tochartsetupui.ui 8 Apr 2003 08:13:47 -0000 1.2 *************** *** 112,116 **** <property> <name>toolTip</name> ! <string>Remember to track this chart to this file always when starting TOra.</string> </property> </widget> --- 112,116 ---- <property> <name>toolTip</name> ! <string>Remember to track this chart to this file always when starting.</string> </property> </widget> Index: toconf.h =================================================================== RCS file: /cvsroot/tora/tora/toconf.h,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** toconf.h 8 Apr 2003 04:22:14 -0000 1.102 --- toconf.h 8 Apr 2003 08:13:48 -0000 1.103 *************** *** 157,162 **** #endif // Version of TOra, must also change rpm files #ifndef TOVERSION ! #define TOVERSION "1.3.10" #endif // Stable or development version of TOra --- 157,165 ---- #endif // Version of TOra, must also change rpm files + #ifndef TOAPPNAME + # define TOAPPNAME "TOra" + #endif #ifndef TOVERSION ! # define TOVERSION "1.3.10" #endif // Stable or development version of TOra Index: todatabasesettingui.ui =================================================================== RCS file: /cvsroot/tora/tora/todatabasesettingui.ui,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** todatabasesettingui.ui 10 Feb 2003 23:11:43 -0000 1.18 --- todatabasesettingui.ui 8 Apr 2003 08:13:48 -0000 1.19 *************** *** 70,74 **** <property> <name>text</name> ! <string>Never read object cache (Will leave parts of TOra nonfunctianal)</string> </property> </item> --- 70,74 ---- <property> <name>text</name> ! <string>Never read object cache (Will leave parts of application nonfunctianal)</string> </property> </item> *************** *** 321,325 **** <property> <name>toolTip</name> ! <string>If checked TOra will not refresh a result if it is reexecuted exactly the same two times in a row.</string> </property> </widget> --- 321,325 ---- <property> <name>toolTip</name> ! <string>If checked will not refresh a result if it is reexecuted exactly the same two times in a row.</string> </property> </widget> Index: toglobalsettingui.ui =================================================================== RCS file: /cvsroot/tora/tora/toglobalsettingui.ui,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** toglobalsettingui.ui 16 Jan 2003 17:01:40 -0000 1.25 --- toglobalsettingui.ui 8 Apr 2003 08:13:48 -0000 1.26 *************** *** 118,122 **** <property> <name>toolTip</name> ! <string>Directory where to find plugins when starting tora.</string> </property> </widget> --- 118,122 ---- <property> <name>toolTip</name> ! <string>Directory where to find plugins when starting.</string> </property> </widget> *************** *** 155,159 **** <property> <name>toolTip</name> ! <string>Directory where to find plugins when starting tora.</string> </property> </widget> --- 155,159 ---- <property> <name>toolTip</name> ! <string>Directory where to place cached dataaseinformation.</string> </property> </widget> *************** *** 175,179 **** <property> <name>toolTip</name> ! <string>Directory where to find plugins when starting tora.</string> </property> </widget> --- 175,179 ---- <property> <name>toolTip</name> ! <string>Directory where to find help files.</string> </property> </widget> *************** *** 212,216 **** <property> <name>toolTip</name> ! <string>What session to use by TOra when saving session.</string> </property> </widget> --- 212,216 ---- <property> <name>toolTip</name> ! <string>Default session to use when saving a session.</string> </property> </widget> *************** *** 477,481 **** <property> <name>toolTip</name> ! <string>Use antialiase fonts if Qt supports this. You need to restart tora for this to take affect.</string> </property> </widget> --- 477,481 ---- <property> <name>toolTip</name> ! <string>Use antialiase fonts if Qt supports this. You need to restart for this to take affect.</string> </property> </widget> *************** *** 530,534 **** <property> <name>toolTip</name> ! <string>Define the unit sizes should be displayed in tora.</string> </property> </widget> --- 530,534 ---- <property> <name>toolTip</name> ! <string>Define the unit sizes should be displayed.</string> </property> </widget> Index: tohelp.cpp =================================================================== RCS file: /cvsroot/tora/tora/tohelp.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** tohelp.cpp 2 Sep 2002 20:25:39 -0000 1.45 --- tohelp.cpp 8 Apr 2003 08:13:49 -0000 1.46 *************** *** 308,312 **** #endif // Help->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred)); ! setCaption(tr("TOra Help Browser")); connect(Help,SIGNAL(textChanged(void)), --- 308,312 ---- #endif // Help->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred)); ! setCaption(tr("Help Browser")); connect(Help,SIGNAL(textChanged(void)), Index: tolinechart.cpp =================================================================== RCS file: /cvsroot/tora/tora/tolinechart.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** tolinechart.cpp 15 Feb 2003 13:40:43 -0000 1.43 --- tolinechart.cpp 8 Apr 2003 08:13:49 -0000 1.44 *************** *** 706,710 **** printer.setMinMax(1,1); if (printer.setup()) { ! printer.setCreator(tr("TOra")); QPainter painter(&printer); QPaintDeviceMetrics metrics(&printer); --- 706,710 ---- printer.setMinMax(1,1); if (printer.setup()) { ! printer.setCreator(tr(TOAPPNAME)); QPainter painter(&printer); QPaintDeviceMetrics metrics(&printer); Index: tomain.cpp =================================================================== RCS file: /cvsroot/tora/tora/tomain.cpp,v retrieving revision 1.163 retrieving revision 1.164 diff -C2 -d -r1.163 -r1.164 *** tomain.cpp 8 Apr 2003 07:06:22 -0000 1.163 --- tomain.cpp 8 Apr 2003 08:13:49 -0000 1.164 *************** *** 114,122 **** #endif ! #ifdef OAS ! #define DEFAULT_TITLE "OAS %s" ! #else ! #define DEFAULT_TITLE "TOra %s" ! #endif const int toMain::TO_FILE_MENU = 10; const int toMain::TO_EDIT_MENU = 20; --- 114,119 ---- #endif ! #define DEFAULT_TITLE TOAPPNAME " %s" ! const int toMain::TO_FILE_MENU = 10; const int toMain::TO_EDIT_MENU = 20; *************** *** 335,339 **** HelpMenu->insertItem(tr("&Contents..."),TO_HELP_CONTENTS); HelpMenu->insertSeparator(); ! HelpMenu->insertItem(tr("&About TOra..."),TO_HELP_ABOUT); HelpMenu->insertItem(tr("&License..."),TO_HELP_LICENSE); HelpMenu->insertItem(tr("&Quotes..."),TO_HELP_QUOTES); --- 332,336 ---- HelpMenu->insertItem(tr("&Contents..."),TO_HELP_CONTENTS); HelpMenu->insertSeparator(); ! HelpMenu->insertItem(tr("&About " TOAPPNAME "..."),TO_HELP_ABOUT); HelpMenu->insertItem(tr("&License..."),TO_HELP_LICENSE); HelpMenu->insertItem(tr("&Quotes..."),TO_HELP_QUOTES); *************** *** 445,448 **** --- 442,446 ---- tr("Stop all running queries on connection"), this,SLOT(stopButton()),ConnectionToolbar)]=NULL; + #else ConnectionToolbar->hide(); #endif *************** *** 554,558 **** } ! #if QT_VERSION >= 300 && !defined (TO_NO_NEW_CHECK) if (toTool::globalConfig(CONF_UPGRADE_CHECK,"Not specified")=="Not specified") { switch(TOMessageBox::information(this,tr("Check for upgrades?"), --- 552,556 ---- } ! #if QT_VERSION >= 300 && !defined (TO_NO_NEW_CHECK) && !defined (OAS) if (toTool::globalConfig(CONF_UPGRADE_CHECK,"Not specified")=="Not specified") { switch(TOMessageBox::information(this,tr("Check for upgrades?"), *************** *** 865,869 **** case TO_HELP_QUOTES: { ! toAbout about(cmd-TO_HELP_ABOUT,this,"About TOra",true); about.exec(); } --- 863,867 ---- case TO_HELP_QUOTES: { ! toAbout about(cmd-TO_HELP_ABOUT,this,"About " TOAPPNAME,true); about.exec(); } *************** *** 1516,1520 **** toUnShift(StatusMessages, tr("Message flood, temporary disabling of message box error reporting from now on.\n" ! "Restart TOra to reenable. You probably have a too high refreshrate in some tool.")); } --- 1514,1518 ---- toUnShift(StatusMessages, tr("Message flood, temporary disabling of message box error reporting from now on.\n" ! "Restart to reenable. You probably have a too high refreshrate in some tool.")); } Index: tomarkedtext.cpp =================================================================== RCS file: /cvsroot/tora/tora/tomarkedtext.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** tomarkedtext.cpp 9 Sep 2002 07:03:44 -0000 1.55 --- tomarkedtext.cpp 8 Apr 2003 08:13:49 -0000 1.56 *************** *** 142,146 **** printer.setFromTo(1,1000); if (printer.setup()) { ! printer.setCreator(tr("TOra")); QPainter painter(&printer); --- 142,146 ---- printer.setFromTo(1,1000); if (printer.setup()) { ! printer.setCreator(tr(TOAPPNAME)); QPainter painter(&printer); Index: tomessageui.ui =================================================================== RCS file: /cvsroot/tora/tora/tomessageui.ui,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tomessageui.ui 7 Oct 2002 22:14:28 -0000 1.3 --- tomessageui.ui 8 Apr 2003 08:13:49 -0000 1.4 *************** *** 18,22 **** <property stdset="1"> <name>caption</name> ! <string>TOra warning message</string> </property> <grid> --- 18,22 ---- <property stdset="1"> <name>caption</name> ! <string>Warning message</string> </property> <grid> Index: tooracleconnection.cpp =================================================================== RCS file: /cvsroot/tora/tora/tooracleconnection.cpp,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** tooracleconnection.cpp 15 Feb 2003 11:59:36 -0000 1.71 --- tooracleconnection.cpp 8 Apr 2003 08:13:50 -0000 1.72 *************** *** 992,996 **** otl_stream info(1, "BEGIN\n" ! " SYS.DBMS_APPLICATION_INFO.SET_CLIENT_INFO('TOra (http://www.globecom.se/tora)');\n" "END;", *conn); --- 992,996 ---- otl_stream info(1, "BEGIN\n" ! " SYS.DBMS_APPLICATION_INFO.SET_CLIENT_INFO('" TOAPPNAME " (http://www.globecom.se/tora)');\n" "END;", *conn); Index: topiechart.cpp =================================================================== RCS file: /cvsroot/tora/tora/topiechart.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** topiechart.cpp 15 Feb 2003 13:40:43 -0000 1.24 --- topiechart.cpp 8 Apr 2003 08:13:50 -0000 1.25 *************** *** 306,310 **** printer.setMinMax(1,1); if (printer.setup()) { ! printer.setCreator(tr("TOra")); QPainter painter(&printer); QPaintDeviceMetrics metrics(&printer); --- 306,310 ---- printer.setMinMax(1,1); if (printer.setup()) { ! printer.setCreator(tr(TOAPPNAME)); QPainter painter(&printer); QPaintDeviceMetrics metrics(&printer); Index: toresultview.cpp =================================================================== RCS file: /cvsroot/tora/tora/toresultview.cpp,v retrieving revision 1.119 retrieving revision 1.120 diff -C2 -d -r1.119 -r1.120 *** toresultview.cpp 8 Apr 2003 04:22:14 -0000 1.119 --- toresultview.cpp 8 Apr 2003 08:13:50 -0000 1.120 *************** *** 629,633 **** printer.setFromTo(1,1000); if (printer.setup()) { ! printer.setCreator(tr("TOra")); QPainter painter(&printer); --- 629,633 ---- printer.setFromTo(1,1000); if (printer.setup()) { ! printer.setCreator(tr(TOAPPNAME)); QPainter painter(&printer); Index: totoolsettingui.ui =================================================================== RCS file: /cvsroot/tora/tora/totoolsettingui.ui,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** totoolsettingui.ui 30 Aug 2001 13:56:11 -0000 1.2 --- totoolsettingui.ui 8 Apr 2003 08:13:50 -0000 1.3 *************** *** 116,120 **** <property stdset="1"> <name>text</name> ! <string>You must restart TOra for any of these changes to have effect.</string> </property> <property stdset="1"> --- 116,120 ---- <property stdset="1"> <name>text</name> ! <string>You must restart for any of these changes to have effect.</string> </property> <property stdset="1"> Index: utils.cpp =================================================================== RCS file: /cvsroot/tora/tora/utils.cpp,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** utils.cpp 15 Feb 2003 13:40:43 -0000 1.135 --- utils.cpp 8 Apr 2003 08:13:50 -0000 1.136 *************** *** 1282,1286 **** QString toCheckLicense(bool) { ! return qApp->translate("toCheckLicense","Welcome to TOra"); } --- 1282,1286 ---- QString toCheckLicense(bool) { ! return qApp->translate("toCheckLicense","Welcome to " TOAPPNAME); } |