Skip to content

C
core
Kaydet (Commit) 86113594 authored tarafından Frank Schönheit's avatar Frank Schönheit
Dosyalara gözat
Seçenekler

#88637# changes in the window hierarchy of the query design - no the SQL view… 

#88637# changes in the window hierarchy of the query design - no the SQL view has a toolbox separator, too
üst f1b67883
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 97 deletions
dbaccess/source/ui/inc/JoinController.hxx
Dosyayı görüntüle @ 86113594
......@@ -2,9 +2,9 @@
*
* $RCSfile: JoinController.hxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: fs $ $Date: 2001-08-14 11:55:40 $
* last change: $Author: fs $ $Date: 2001-08-23 14:23:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -170,6 +170,8 @@ namespace dbaui
protected:
virtual OTableWindowData* createTableWindowData() = 0;
virtual void AddSupportedFeatures();
virtual OJoinDesignView* getJoinView();
};
}
#endif // DBAUI_JOINCONTROLLER_HXX
......
dbaccess/source/ui/inc/JoinDesignView.hxx
Dosyayı görüntüle @ 86113594
......@@ -2,9 +2,9 @@
*
* $RCSfile: JoinDesignView.hxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: oj $ $Date: 2001-02-28 10:06:45 $
* last change: $Author: fs $ $Date: 2001-08-23 14:23:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -106,7 +106,7 @@ namespace dbaui
virtual void setReadOnly(sal_Bool _bReadOnly);
// set the statement for representation
/// late construction
virtual void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel);
virtual void Construct();
virtual void initialize();
virtual void SaveTabWinUIConfig(OTableWindow* pWin);
......@@ -122,7 +122,7 @@ namespace dbaui
void SaveUIConfig();
protected:
// return the Rectangle where I can paint myself
virtual void resizeControl(Rectangle& rRect);
virtual void resizeDocumentView(Rectangle& rRect);
DECL_LINK( SplitHdl, void* );
};
}
......
dbaccess/source/ui/inc/QueryDesignView.hxx
Dosyayı görüntüle @ 86113594
......@@ -2,9 +2,9 @@
*
* $RCSfile: QueryDesignView.hxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: oj $ $Date: 2001-05-02 12:44:12 $
* last change: $Author: fs $ $Date: 2001-08-23 14:23:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -96,6 +96,7 @@ namespace dbaui
class OTableConnection;
class OQueryTableConnectionData;
class OConnectionLineData;
class OQueryContainerWindow;
class OQueryDesignView : public OQueryView
{
......@@ -172,7 +173,7 @@ namespace dbaui
sal_Int32 GetColumnFormatKey(const ::connectivity::OSQLParseNode* pColumnRef);
public:
OQueryDesignView(Window* pParent, OQueryController* _pController,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
OQueryDesignView(OQueryContainerWindow* pParent, OQueryController* _pController,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
virtual ~OQueryDesignView();
virtual sal_Bool isCutAllowed();
......@@ -190,7 +191,7 @@ namespace dbaui
// returns the current sql statement
virtual ::rtl::OUString getStatement();
/// late construction
virtual void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel);
virtual void Construct();
virtual void initialize();
// window overloads
virtual long PreNotify( NotifyEvent& rNEvt );
......@@ -220,7 +221,7 @@ namespace dbaui
void startTimer();
protected:
// return the Rectangle where I can paint myself
virtual void resizeControl(Rectangle& rRect);
virtual void resizeDocumentView(Rectangle& rRect);
DECL_LINK( SplitHdl, void* );
};
}
......
dbaccess/source/ui/inc/QueryTextView.hxx
Dosyayı görüntüle @ 86113594
......@@ -2,9 +2,9 @@
*
* $RCSfile: QueryTextView.hxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: oj $ $Date: 2001-08-15 13:13:06 $
* last change: $Author: fs $ $Date: 2001-08-23 14:23:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -64,69 +64,20 @@
#ifndef DBAUI_QUERYVIEW_HXX
#include "queryview.hxx"
#endif
#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
#include <com/sun/star/frame/XFrame.hpp>
#ifndef DBAUI_QUERYCONTAINERWINDOW_HXX
#include "querycontainerwindow.hxx"
#endif
#ifndef DBAUI_QUERYVIEWSWITCH_HXX
#include "QueryViewSwitch.hxx"
#endif
#ifndef _SV_DOCKWIN_HXX
#include <vcl/dockwin.hxx>
#endif
class Splitter;
namespace dbaui
{
// tempoaray class until the beamer is implemented
class OBeamer : public DockingWindow
{
public:
OBeamer(Window* _pParent) : DockingWindow(_pParent,0){}
};
class OQueryViewSwitch;
class OQueryContainerWindow : public Window
{
OQueryViewSwitch* m_pView;
OBeamer* m_pBeamer;
Splitter* m_pSplitter;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xBeamer;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xMe; // our own UNO representation
DECL_LINK( SplitHdl, void* );
public:
OQueryContainerWindow(Window* pParent, OQueryController* _pController,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
~OQueryContainerWindow();
virtual void Resize();
virtual long PreNotify( NotifyEvent& rNEvt );
// show the beamer
void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame);
// called when the beamer has been disposed
void disposingPreview();
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
getPreviewFrame() const { return m_xBeamer; }
void initialize(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame);
OQueryViewSwitch* getView() { return m_pView; }
void switchView();
virtual void GetFocus();
};
// end of temp classes
class OSqlEdit;
class OQueryTextView : public Window
{
friend class OQueryViewSwitch;
OSqlEdit* m_pEdit;
ToolBox* m_pToolBox; // the toolbox is owned by OQueryDesignView
public:
OQueryTextView(Window* pParent,ToolBox* _pToolBox);
OQueryTextView( OQueryContainerWindow* pParent );
virtual ~OQueryTextView();
virtual void GetFocus();
......@@ -144,10 +95,10 @@ namespace dbaui
// set the statement for representation
virtual void setStatement(const ::rtl::OUString& _rsStatement);
virtual ::rtl::OUString getStatement();
/// late construction
virtual void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel);
// allow access to our edit
OSqlEdit* getSqlEdit() const { return m_pEdit; }
OQueryContainerWindow* getContainerWindow() { return static_cast< OQueryContainerWindow* >( GetParent() ); }
protected:
virtual void Resize();
};
......
dbaccess/source/ui/inc/QueryViewSwitch.hxx
Dosyayı görüntüle @ 86113594
......@@ -2,9 +2,9 @@
*
* $RCSfile: QueryViewSwitch.hxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: oj $ $Date: 2001-08-15 13:13:06 $
* last change: $Author: fs $ $Date: 2001-08-23 14:23:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -70,12 +70,13 @@ namespace dbaui
class OQueryDesignView;
class OQueryTextView;
class OAddTableDlg;
class OQueryContainerWindow;
class OQueryViewSwitch
{
OQueryDesignView* m_pDesignView;
OQueryTextView* m_pTextView;
public:
OQueryViewSwitch(Window* pParent, OQueryController* _pController,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
OQueryViewSwitch(OQueryContainerWindow* pParent, OQueryController* _pController,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
virtual ~OQueryViewSwitch();
virtual sal_Bool isCutAllowed();
......@@ -93,7 +94,7 @@ namespace dbaui
// returns the current sql statement
virtual ::rtl::OUString getStatement();
/// late construction
virtual void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel);
virtual void Construct();
virtual void initialize();
// show the text or the design view
void switchView();
......@@ -107,13 +108,14 @@ namespace dbaui
void clearDesignView();
void GetFocus();
OQueryDesignView* getRealView() const { return m_pDesignView; }
OQueryDesignView* getDesignView() const { return m_pDesignView; }
OQueryContainerWindow* getContainer() const;
void SetPosSizePixel( Point _rPt,Size _rSize);
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const;
protected:
// return the Rectangle where I can paint myself
virtual void resizeControl(Rectangle& rRect);
virtual void resizeDocumentView(Rectangle& rRect);
};
}
#endif // DBAUI_QUERYVIEWSWITCH_HXX
......
dbaccess/source/ui/inc/RelationDesignView.hxx
Dosyayı görüntüle @ 86113594
......@@ -2,9 +2,9 @@
*
* $RCSfile: RelationDesignView.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: oj $ $Date: 2001-03-20 08:15:49 $
* last change: $Author: fs $ $Date: 2001-08-23 14:23:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -94,7 +94,7 @@ namespace dbaui
// set the statement for representation
/// late construction
virtual void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel);
virtual void Construct();
virtual void initialize();
......
dbaccess/source/ui/inc/TableDesignView.hxx
Dosyayı görüntüle @ 86113594
......@@ -2,9 +2,9 @@
*
* $RCSfile: TableDesignView.hxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: oj $ $Date: 2001-07-16 07:50:32 $
* last change: $Author: fs $ $Date: 2001-08-23 14:23:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -119,7 +119,7 @@ namespace dbaui
// return the Rectangle where I can paint myself
virtual void resizeControl(Rectangle& rRect);
virtual void resizeDocumentView(Rectangle& rRect);
public:
OTableDesignView( Window* pParent,
......
dbaccess/source/ui/inc/brwview.hxx
Dosyayı görüntüle @ 86113594
......@@ -2,9 +2,9 @@
*
* $RCSfile: brwview.hxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: fs $ $Date: 2001-04-12 15:29:35 $
* last change: $Author: fs $ $Date: 2001-08-23 14:23:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -95,6 +95,7 @@ namespace dbaui
{
protected:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > m_xGrid; // our grid's UNO representation
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xMe; // our own UNO representation
DBTreeView* m_pTreeView;
Splitter* m_pSplitter;
SbaGridControl* m_pVclControl; // our grid's VCL representation
......@@ -127,10 +128,12 @@ namespace dbaui
void showStatus( const String& _rStatus );
void hideStatus();
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getContainer() { return m_xMe; }
protected:
virtual long PreNotify( NotifyEvent& rNEvt );
virtual void GetFocus();
virtual void resizeControl(Rectangle& rRect);
virtual void resizeDocumentView(Rectangle& rRect);
};
class BrowserViewStatusDisplay
......
dbaccess/source/ui/inc/querycontroller.hxx
Dosyayı görüntüle @ 86113594
......@@ -2,9 +2,9 @@
*
* $RCSfile: querycontroller.hxx,v $
*
* $Revision: 1.16 $
* $Revision: 1.17 $
*
* last change: $Author: fs $ $Date: 2001-08-14 11:54:31 $
* last change: $Author: fs $ $Date: 2001-08-23 14:23:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -100,6 +100,9 @@
#ifndef DBAUI_QUERYDESIGNCONTEXT_HXX
#include "ParseContext.hxx"
#endif
#ifndef DBAUI_QUERYCONTAINERWINDOW_HXX
#include "querycontainerwindow.hxx"
#endif
class VCLXWindow;
......@@ -130,8 +133,6 @@ namespace dbaui
::rtl::OUString m_sUpdateTableName; // table for update data
::rtl::OUString m_sName; // name of the query
OQueryContainerWindow* m_pWindow; // temporary window
sal_Int32 m_nVisibleRows; // which rows the selection browse should show
sal_Int32 m_nSplitPos; // the position of the splitter
sal_Bool m_bDesign; // if design is true then we show the complete design otherwise only the text format
......@@ -162,17 +163,17 @@ namespace dbaui
virtual void Execute(sal_uInt16 nId);
virtual ToolBox* CreateToolBox(Window* pParent);
OQueryView* getQueryView() { return static_cast<OQueryView*>(m_pView); }
virtual void reconnect( sal_Bool _bUI );
OQueryContainerWindow* getContainer() { return static_cast< OQueryContainerWindow* >( getView() ); }
public:
OQueryController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM);
~OQueryController();
::std::vector<OTableFieldDesc*>* getTableFieldDesc() { return &m_vTableFieldDesc; }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getComponentWindow();
virtual void setModified(sal_Bool _bModified=sal_True);
// should the statement be parsed by our own sql parser
......@@ -223,6 +224,7 @@ namespace dbaui
protected:
virtual OTableWindowData* createTableWindowData();
virtual OJoinDesignView* getJoinView();
};
}
#endif // DBAUI_QUERYCONTROLLER_HXX
......
dbaccess/source/ui/inc/queryview.hxx
Dosyayı görüntüle @ 86113594
......@@ -2,9 +2,9 @@
*
* $RCSfile: queryview.hxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: oj $ $Date: 2001-04-18 13:19:01 $
* last change: $Author: fs $ $Date: 2001-08-23 14:23:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -88,12 +88,6 @@ namespace dbaui
virtual void setStatement(const ::rtl::OUString& _rsStatement) = 0;
// returns the current sql statement
virtual ::rtl::OUString getStatement() = 0;
/// late construction
virtual void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel);
protected:
// return the Rectangle where I can paint myself
virtual void resizeControl(Rectangle& rRect);
//
};
}
#endif // DBAUI_QUERYVIEW_HXX
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment