[Tora-cvs] tora NEWS,1.835,1.836 toabout.cpp,1.71,1.72 toconf.h,1.101,1.102 tomain.cpp,1.161,1.162 toresultview.cpp,1.118,1.119 toresultview.h,1.57,1.58

[<hp...@us...>]

Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv6479

Modified Files:
	NEWS toabout.cpp toconf.h tomain.cpp toresultview.cpp 
	toresultview.h 
Log Message:


Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.835
retrieving revision 1.836
diff -C2 -d -r1.835 -r1.836
*** NEWS	19 Mar 2003 16:40:22 -0000	1.835
--- NEWS	8 Apr 2003 04:22:13 -0000	1.836
***************
*** 1,4 ****
--- 1,6 ----
  1.3.10:
  
+ 2003-04-08: Fixed column resizing problem on numeric only values.
+ 2003-04-08: Removed some functionality when compiling for OAS (Proprietary project)
  2003-03-19: Make Enter work same as Return in syntax highlighting.
  2003-03-13: Added while, out and type reserved words.

Index: toabout.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toabout.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** toabout.cpp	4 Feb 2003 21:23:51 -0000	1.71
--- toabout.cpp	8 Apr 2003 04:22:14 -0000	1.72
***************
*** 55,59 ****
  #include "icons/largelogo.xpm"
  
! #ifdef TO_LICENSE
  static const char *AboutText="<IMG SRC=largelogo.xpm><BR>\n"
  "Version %1 (<A HREF=http://www.globecom.se/tora>http://www.globecom.se/tora</A>)\n"
--- 55,62 ----
  #include "icons/largelogo.xpm"
  
! #ifdef OAS
! #include "oasabout.h"
! #else
! #  ifdef TO_LICENSE
  static const char *AboutText="<IMG SRC=largelogo.xpm><BR>\n"
  "Version %1 (<A HREF=http://www.globecom.se/tora>http://www.globecom.se/tora</A>)\n"
***************
*** 75,79 ****
  "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
! #else
  static const char *AboutText="<IMG SRC=largelogo.xpm><BR>\n"
  "Version %1 (<A HREF=http://www.globecom.se/tora>http://www.globecom.se/tora</A>)\n"
--- 78,82 ----
  "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
! #  else
  static const char *AboutText="<IMG SRC=largelogo.xpm><BR>\n"
  "Version %1 (<A HREF=http://www.globecom.se/tora>http://www.globecom.se/tora</A>)\n"
***************
*** 97,101 ****
  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
  "GNU General Public License for more details."
! #endif
  "<HR BREAK=ALL>\n"
  "Contributors (In alphabetical order):<P>\n"
--- 100,104 ----
  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
  "GNU General Public License for more details."
! #  endif
  "<HR BREAK=ALL>\n"
  "Contributors (In alphabetical order):<P>\n"
***************
*** 130,133 ****
--- 133,137 ----
  "<B>Joachim Zetzsche</B>,\n"
  "<B>Massimiliano Ziccardi</B>...\n";
+ #endif
  
  static const char *QuoteText="<H3>People who think they know everything tend to irritate those of us who do.</H3>\n"
***************
*** 244,247 ****
--- 248,254 ----
  "but none of them serious.</H3>\n"
  "<DIV ALIGN=RIGHT>Boxer Alan Minter\n"
+ "<DIV ALIGN=LEFT>\n"
+ "<H3>Plans are useless, but planning is indispensible.</H3>\n"
+ "<DIV ALIGN=RIGHT>Dwight Eisenhower\n"
  "<DIV ALIGN=LEFT>\n"
  "<H3>Life is a sexually transmittable desease with terminal outcome.</H3>\n"

Index: toconf.h
===================================================================
RCS file: /cvsroot/tora/tora/toconf.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** toconf.h	10 Mar 2003 02:20:10 -0000	1.101
--- toconf.h	8 Apr 2003 04:22:14 -0000	1.102
***************
*** 157,161 ****
--- 157,163 ----
  #endif
  // Version of TOra, must also change rpm files
+ #ifndef TOVERSION
  #define TOVERSION               "1.3.10"
+ #endif
  // Stable or development version of TOra
  #define TOTYPE			"DEVELOP"

Index: tomain.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tomain.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -C2 -d -r1.161 -r1.162
*** tomain.cpp	15 Feb 2003 22:31:56 -0000	1.161
--- tomain.cpp	8 Apr 2003 04:22:14 -0000	1.162
***************
*** 93,97 ****
  #endif
  
- #include "icons/commit.xpm"
  #include "icons/connect.xpm"
  #include "icons/copy.xpm"
--- 93,96 ----
***************
*** 103,116 ****
  #include "icons/print.xpm"
  #include "icons/redo.xpm"
- #include "icons/refresh.xpm"
- #include "icons/rollback.xpm"
  #include "icons/search.xpm"
- #include "icons/stop.xpm"
  #include "icons/toramini.xpm"
  #include "icons/undo.xpm"
  #include "icons/up.xpm"
  
! #define DEFAULT_TITLE "TOra %s"
  
  const int toMain::TO_FILE_MENU		= 10;
  const int toMain::TO_EDIT_MENU		= 20;
--- 102,122 ----
  #include "icons/print.xpm"
  #include "icons/redo.xpm"
  #include "icons/search.xpm"
  #include "icons/toramini.xpm"
  #include "icons/undo.xpm"
  #include "icons/up.xpm"
  
! #ifndef OAS
! #include "icons/commit.xpm"
! #include "icons/rollback.xpm"
! #include "icons/stop.xpm"
! #include "icons/refresh.xpm"
! #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;
***************
*** 193,196 ****
--- 199,203 ----
    FileMenu->insertItem(QPixmap((const char **)disconnect_xpm),
  		       tr("&Close Connection"),this,SLOT(delConnection()),0,TO_CLOSE_CONNECTION);
+ #ifndef OAS
    FileMenu->insertSeparator();
    FileMenu->insertItem(QPixmap((const char **)commit_xpm),tr("&Commit Connection"),TO_FILE_COMMIT);
***************
*** 199,202 ****
--- 206,210 ----
    FileMenu->insertItem(QPixmap((const char **)stop_xpm),tr("Stop All Queries"),TO_STOP_ALL);
    FileMenu->insertItem(QPixmap((const char **)refresh_xpm),tr("Reread Object Cache"),TO_FILE_CLEARCACHE);
+ #endif
    FileMenu->insertSeparator();
    FileMenu->insertItem(QPixmap((const char **)fileopen_xpm),tr("&Open File..."),TO_FILE_OPEN);
***************
*** 218,225 ****
--- 226,235 ----
    FileMenu->setAccel(Key_O|CTRL,TO_FILE_OPEN);
    FileMenu->setAccel(Key_W|CTRL,TO_FILE_SAVE);
+ #ifndef OAS
    FileMenu->setAccel(Key_L|CTRL,TO_FILE_COMMIT);
    FileMenu->setAccel(Key_J|CTRL,TO_STOP_ALL);
    FileMenu->setAccel(Key_Less|CTRL,TO_FILE_ROLLBACK);
    FileMenu->setAccel(Key_U|CTRL,TO_FILE_CURRENT);
+ #endif
  
    updateRecent();
***************
*** 420,423 ****
--- 430,434 ----
  				   this,SLOT(delConnection()),ConnectionToolbar);
    DisconnectButton->setEnabled(false);
+ #ifndef OAS
    ConnectionToolbar->addSeparator();
    NeedConnection[new QToolButton(QPixmap((const char **)commit_xpm),
***************
*** 434,437 ****
--- 445,449 ----
  				 tr("Stop all running queries on connection"),
  				 this,SLOT(stopButton()),ConnectionToolbar)]=NULL;
+ #endif
    ConnectionToolbar->addSeparator();
    ConnectionSelection=new QComboBox(ConnectionToolbar,TO_KDE_TOOLBAR_WIDGET);
***************
*** 439,442 ****
--- 451,455 ----
    ConnectionSelection->setFocusPolicy(NoFocus);
    connect(ConnectionSelection,SIGNAL(activated(int)),this,SLOT(changeConnection()));
+   ConnectionToolbar->hide();
  
    menuBar()->insertItem(tr("&Tools"),ToolsMenu,TO_TOOLS_MENU);

Index: toresultview.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toresultview.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** toresultview.cpp	15 Feb 2003 22:31:56 -0000	1.118
--- toresultview.cpp	8 Apr 2003 04:22:14 -0000	1.119
***************
*** 125,133 ****
  }
  
! int toResultViewMLine::realWidth(const QFontMetrics &fm, const QListView *top, int column) const
  {
    if (!MaxColDisp)
      MaxColDisp=toTool::globalConfig(CONF_MAX_COL_DISP,DEFAULT_MAX_COL_DISP).toInt();
!   return min(TextWidth(fm,text(column)),MaxColDisp)+top->itemMargin()*2+2;
  }
  
--- 125,136 ----
  }
  
! int toResultViewMLine::realWidth(const QFontMetrics &fm, const QListView *top, int column,const QString &txt) const
  {
    if (!MaxColDisp)
      MaxColDisp=toTool::globalConfig(CONF_MAX_COL_DISP,DEFAULT_MAX_COL_DISP).toInt();
!   QString t=text(column);
!   if (t.isNull())
!     t=txt;
!   return min(TextWidth(fm,t),MaxColDisp)+top->itemMargin()*2+2;
  }
  
***************
*** 152,160 ****
  }
  
! int toResultViewItem::realWidth(const QFontMetrics &fm, const QListView *top, int column) const
  {
    if (!MaxColDisp)
      MaxColDisp=toTool::globalConfig(CONF_MAX_COL_DISP,DEFAULT_MAX_COL_DISP).toInt();
!   QRect bounds=fm.boundingRect(text(column));
    return min(bounds.width(),MaxColDisp)+top->itemMargin()*2+2;
  }
--- 155,166 ----
  }
  
! int toResultViewItem::realWidth(const QFontMetrics &fm, const QListView *top, int column,const QString &txt) const
  {
    if (!MaxColDisp)
      MaxColDisp=toTool::globalConfig(CONF_MAX_COL_DISP,DEFAULT_MAX_COL_DISP).toInt();
!   QString t=text(column);
!   if (t.isNull())
!     t=txt;
!   QRect bounds=fm.boundingRect(t);
    return min(bounds.width(),MaxColDisp)+top->itemMargin()*2+2;
  }
***************
*** 211,215 ****
        ColumnData[col].KeyAsc=ColumnData[col].KeyDesc=ColumnData[col].Data;
      }
!     ColumnData[col].Width=realWidth(listView()->fontMetrics(),listView(),col);
    }
    QListViewItem::setText(col,firstText(col));
--- 217,221 ----
        ColumnData[col].KeyAsc=ColumnData[col].KeyDesc=ColumnData[col].Data;
      }
!     ColumnData[col].Width=realWidth(listView()->fontMetrics(),listView(),col,txt);
    }
    QListViewItem::setText(col,firstText(col));
***************
*** 264,268 ****
        ColumnData[col].KeyAsc=ColumnData[col].KeyDesc=ColumnData[col].Data;
      }
!     ColumnData[col].Width=realWidth(listView()->fontMetrics(),listView(),col);
    }
    QCheckListItem::setText(col,firstText(col));
--- 270,274 ----
        ColumnData[col].KeyAsc=ColumnData[col].KeyDesc=ColumnData[col].Data;
      }
!     ColumnData[col].Width=realWidth(listView()->fontMetrics(),listView(),col,txt);
    }
    QCheckListItem::setText(col,firstText(col));
***************
*** 312,327 ****
  }
  
! int toResultViewMLCheck::realWidth(const QFontMetrics &fm, const QListView *top, int column) const
  {
    if (!MaxColDisp)
      MaxColDisp=toTool::globalConfig(CONF_MAX_COL_DISP,DEFAULT_MAX_COL_DISP).toInt();
!   return min(TextWidth(fm,text(column)),MaxColDisp)+top->itemMargin()*2+2;
  }
  
! int toResultViewCheck::realWidth(const QFontMetrics &fm, const QListView *top, int column) const
  {
    if (!MaxColDisp)
      MaxColDisp=toTool::globalConfig(CONF_MAX_COL_DISP,DEFAULT_MAX_COL_DISP).toInt();
!   QRect bounds=fm.boundingRect(text(column));
    return min(bounds.width(),MaxColDisp)+top->itemMargin()*2+2;
  }
--- 318,339 ----
  }
  
! int toResultViewMLCheck::realWidth(const QFontMetrics &fm, const QListView *top, int column,const QString &txt) const
  {
    if (!MaxColDisp)
      MaxColDisp=toTool::globalConfig(CONF_MAX_COL_DISP,DEFAULT_MAX_COL_DISP).toInt();
!   QString t=text(column);
!   if (t.isNull())
!     t=txt;
!   return min(TextWidth(fm,t),MaxColDisp)+top->itemMargin()*2+2;
  }
  
! int toResultViewCheck::realWidth(const QFontMetrics &fm, const QListView *top, int column,const QString &txt) const
  {
    if (!MaxColDisp)
      MaxColDisp=toTool::globalConfig(CONF_MAX_COL_DISP,DEFAULT_MAX_COL_DISP).toInt();
!   QString t=text(column);
!   if (t.isNull())
!     t=txt;
!   QRect bounds=fm.boundingRect(t);
    return min(bounds.width(),MaxColDisp)+top->itemMargin()*2+2;
  }

Index: toresultview.h
===================================================================
RCS file: /cvsroot/tora/tora/toresultview.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** toresultview.h	11 Feb 2003 22:18:39 -0000	1.57
--- toresultview.h	8 Apr 2003 04:22:15 -0000	1.58
***************
*** 101,105 ****
    QString firstText(int col) const;
  protected:
!   virtual int realWidth(const QFontMetrics &fm, const QListView *top, int column) const;
  public:
    /** Create a new item.
--- 101,105 ----
    QString firstText(int col) const;
  protected:
!   virtual int realWidth(const QFontMetrics &fm, const QListView *top, int column,const QString &txt) const;
  public:
    /** Create a new item.
***************
*** 168,172 ****
    int Lines;
  protected:
!   virtual int realWidth(const QFontMetrics &fm, const QListView *top, int column) const;
  public:
    /** Create a new item.
--- 168,172 ----
    int Lines;
  protected:
!   virtual int realWidth(const QFontMetrics &fm, const QListView *top, int column,const QString &txt) const;
  public:
    /** Create a new item.
***************
*** 219,223 ****
    keyData *ColumnData;
  protected:
!   virtual int realWidth(const QFontMetrics &fm, const QListView *top, int column) const;
    QString firstText(int col) const;
  public:
--- 219,223 ----
    keyData *ColumnData;
  protected:
!   virtual int realWidth(const QFontMetrics &fm, const QListView *top, int column,const QString &txt) const;
    QString firstText(int col) const;
  public:
***************
*** 292,296 ****
    int Lines;
  protected:
!   virtual int realWidth(const QFontMetrics &fm, const QListView *top, int column) const;
  public:
    /** Create a new item.
--- 292,296 ----
    int Lines;
  protected:
!   virtual int realWidth(const QFontMetrics &fm, const QListView *top, int column,const QString &txt) const;
  public:
    /** Create a new item.