diff options
author | Release Engineers <releng@openoffice.org> | 2009-05-06 10:59:57 +0000 |
---|---|---|
committer | Release Engineers <releng@openoffice.org> | 2009-05-06 10:59:57 +0000 |
commit | 571115d577ea66c9f4111ee50e562353df966e36 (patch) | |
tree | 30fa3d442e87e0053604c87ef5e53b1318f8a83f /soldep | |
parent | 90b331f3e0879c7e9d099f3f2326f22f2cc49c86 (diff) |
CWS-TOOLING: integrate CWS mba32issues01
2009-05-05 18:23:27 +0200 mba r271547 : apply diffs from m45->m47 for all files moved from dialog to cui
2009-05-05 18:22:02 +0200 mba r271545 : apply diffs from m45->m47 for all files moved from dialog to cui
2009-05-05 18:16:42 +0200 mba r271544 : apply diffs from m45->m47 for all files moved from dialog to cui
2009-04-29 19:35:58 +0200 mba r271392 : #i73672#: unify commands for inserting special characters
2009-04-29 18:01:27 +0200 mba r271391 : #i101337#: missing string resources
2009-04-29 18:01:10 +0200 mba r271390 : #i101337#: missing string resources
2009-04-29 15:42:47 +0200 mba r271380 : concurrency problem in multithreaded dmake due to missing dependency
2009-04-28 17:36:03 +0200 tbo r271336 : #i99432#
2009-04-28 13:57:52 +0200 mba r271322 : #i101302#: ctor might be called with pSet=0
2009-04-22 19:32:39 +0200 tbo r271138 : #i99432#
2009-04-09 14:46:03 +0200 mba r270709 : make sendreportw32.cxx compile with pch
2009-04-06 16:05:07 +0200 mba r270568 : #i99432#: some tweaks for build order
2009-04-06 15:38:52 +0200 mba r270558 : typo
2009-04-06 13:36:19 +0200 mba r270542 : #i99432#: split of localization also
2009-04-06 13:19:06 +0200 mba r270539 : #i99432#: split up srs files also
2009-04-03 17:57:59 +0200 mba r270513 : #i99432#: split dialog folder into two
2009-04-03 17:56:46 +0200 mba r270512 : #i99432#: split dialog folder into two
2009-04-01 22:15:00 +0200 mba r270364 : warnings on Linux
2009-04-01 22:10:44 +0200 mba r270363 : warnings on Linux
2009-04-01 21:43:54 +0200 mba r270362 : warning fixed
2009-04-01 21:41:27 +0200 mba r270361 : warning on Linux fixed
2009-04-01 21:35:44 +0200 mba r270360 : warning fixed
2009-04-01 20:19:59 +0200 mba r270358 : warning found on Linux fixed
2009-04-01 19:23:38 +0200 mba r270354 : warning due to missing eof
2009-04-01 18:56:25 +0200 mba r270352 : linking problem fixed that appeared only on mac
2009-04-01 18:41:30 +0200 mba r270350 : warnings discovered on Linux fixed
2009-04-01 18:34:28 +0200 mba r270349 : some fixes for warnings and include problems discoverd after resync and build on mac
2009-04-01 14:08:22 +0200 mba r270328 : CWS-TOOLING: rebase CWS mba32issues01 to trunk@270033 (milestone: DEV300:m45)
2009-03-04 18:13:35 +0100 mba r268858 : #i99432#: more dialogs moved to cui
2009-03-04 17:47:41 +0100 mba r268854 : #i99432#: more dialogs moved to cui
2009-03-04 17:32:39 +0100 mba r268851 : warning fixed
2009-03-04 12:59:26 +0100 mba r268814 : #i99432#: more dialogs moved to cui
2009-03-04 11:49:03 +0100 mba r268802 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:46:00 +0100 mba r268795 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:43:50 +0100 mba r268794 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:00:29 +0100 mba r268792 : #i99432#: CharmapDialog moved to cui
2009-03-04 10:00:03 +0100 mba r268791 : #i99432#: CharmapDialog moved to cui
2009-03-04 09:59:43 +0100 mba r268790 : #i99432#: CharmapDialog moved to cui
2009-03-04 09:58:51 +0100 mba r268789 : #i99432#: CharmapDialog moved to cui
2009-03-04 09:58:16 +0100 mba r268788 : #i99432#: CharmapDialog moved to cui
2009-03-03 16:33:14 +0100 mba r268763 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:32:28 +0100 mba r268762 : #i99432#: some tabpages moved to cui
2009-03-03 16:32:09 +0100 mba r268761 : #i99432#: some tabpages moved to cui
2009-03-03 16:29:40 +0100 mba r268760 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:29:08 +0100 mba r268759 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:28:41 +0100 mba r268758 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:28:18 +0100 mba r268757 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:27:36 +0100 mba r268756 : #i99465#: replace FN_SYMBOL by SID_CHARMAP
2009-03-03 16:27:02 +0100 mba r268755 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:26:23 +0100 mba r268754 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:25:30 +0100 mba r268753 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:24:49 +0100 mba r268752 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:24:35 +0100 mba r268751 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:23:20 +0100 mba r268750 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:23:04 +0100 mba r268749 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:21:56 +0100 mba r268748 : #i99465#: new SfxAbstractDialog interface and creation methods
2009-03-03 16:18:39 +0100 mba r268747 : #i99432#: MacroAssignment page moved to cui
2009-03-03 16:13:14 +0100 mba r268745 : #i99465#: replace FN_SYMBOL by SID_CHARMAP
2009-03-03 16:02:54 +0100 mba r268738 : #i99432#: moved MacroAssignment TabPage from sfx2
2009-03-03 14:57:58 +0100 mba r268729 : #i99465#: transport return value via ItemSet
2009-03-03 00:08:10 +0100 mba r268701 : #i99432#: move acccfg to cuilib
2009-03-03 00:07:32 +0100 mba r268700 : #i99432#: move acccfg to cuilib
2009-03-03 00:02:01 +0100 mba r268699 : #i99432#: move acccfg to cuilib
2009-03-03 00:01:38 +0100 mba r268698 : #i99432#: move acccfg to cuilib
2009-03-03 00:01:11 +0100 mba r268697 : #i99432#: move acccfg to cuilib
2009-03-03 00:00:40 +0100 mba r268696 : #i99432#: move acccfg to cuilib
2009-03-03 00:00:06 +0100 mba r268695 : #i99432#: replace SfxAbstractSingleTabDialog by SfxAbstractDialog
2009-03-02 23:59:22 +0100 mba r268694 : #i99432#: move acccfg to cuilib
2009-03-02 23:57:19 +0100 mba r268693 : #i99432#: move acccfg to svx
2009-03-02 23:56:14 +0100 mba r268692 : #i99432#: replace SfxAbstractSingleTabDialog by SfxAbstractDialog
2009-03-02 23:49:37 +0100 mba r268691 : #i99785#: consolidate dialogs library
2009-03-02 17:26:40 +0100 mba r268683 : #i99785#: consolidate dialogs library
2009-03-02 17:24:28 +0100 mba r268682 : i99465#: consolidate slot for InsertSymbol command
2009-03-02 17:22:29 +0100 mba r268681 : #i99785#: consolidate dialogs library
2009-03-02 17:18:11 +0100 mba r268680 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 17:08:30 +0100 mba r268679 : #i99785#: consolidate dialogs library
2009-03-02 17:06:57 +0100 mba r268678 : #i99785#: consolidate dialogs library
2009-03-02 17:06:30 +0100 mba r268677 : #i99785#: consolidate dialogs library
2009-03-02 17:05:02 +0100 mba r268676 : #i99785#: consolidate dialogs library
2009-03-02 17:04:35 +0100 mba r268675 : #i99785#: consolidate dialogs library
2009-03-02 16:47:53 +0100 mba r268673 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:45:17 +0100 mba r268671 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:39:59 +0100 mba r268670 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:38:59 +0100 mba r268668 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:38:28 +0100 mba r268667 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:36:06 +0100 mba r268666 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:29:50 +0100 mba r268663 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:24:00 +0100 mba r268659 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:23:31 +0100 mba r268658 : i99432#: move accelconfig and macroassignment to cui
2009-03-02 16:22:41 +0100 mba r268657 : i99432#: move accelconfig and macroassignment to cui
2009-02-25 16:57:26 +0100 mba r268453 : obsolete
2009-02-17 10:50:51 +0100 mba r267846 : obsolete
2009-02-12 16:33:54 +0100 mba r267676 : #i96834#: warning fixed
2009-02-11 19:28:47 +0100 mba r267626 : #i91978#: unused code
2009-02-11 18:37:47 +0100 mba r267625 : metafile output, fixes for 3 layer office
2009-02-11 12:56:28 +0100 mba r267593 : selective trees; incomplete build lists; metafile output
Diffstat (limited to 'soldep')
-rw-r--r-- | soldep/inc/soldep/connctr.hxx | 1 | ||||
-rw-r--r-- | soldep/inc/soldep/depwin.hxx | 1 | ||||
-rw-r--r-- | soldep/inc/soldep/objwin.hxx | 1 | ||||
-rw-r--r-- | soldep/inc/soldep/soldlg.hrc | 1 | ||||
-rw-r--r-- | soldep/source/connctr.cxx | 32 | ||||
-rw-r--r-- | soldep/source/depapp.cxx | 24 | ||||
-rw-r--r-- | soldep/source/depper.cxx | 11 | ||||
-rw-r--r-- | soldep/source/depwin.cxx | 15 | ||||
-rw-r--r-- | soldep/source/makefile.mk | 2 | ||||
-rw-r--r-- | soldep/source/objwin.cxx | 44 | ||||
-rw-r--r-- | soldep/source/soldep.cxx | 59 | ||||
-rw-r--r-- | soldep/source/soldlg.src | 747 |
12 files changed, 536 insertions, 402 deletions
diff --git a/soldep/inc/soldep/connctr.hxx b/soldep/inc/soldep/connctr.hxx index 4047e50c0164..478cf2843cc3 100644 --- a/soldep/inc/soldep/connctr.hxx +++ b/soldep/inc/soldep/connctr.hxx @@ -81,6 +81,7 @@ public: void SetVisibility( BOOL visible ) { bVisible = visible; } void UpdateVisibility(); void SetHideMode(BOOL bHide) { msbHideMode = bHide; }; + void DrawOutput( OutputDevice* pDevice, const Point& rOffset ); }; DECLARE_LIST( ConnectorList, Connector* ) diff --git a/soldep/inc/soldep/depwin.hxx b/soldep/inc/soldep/depwin.hxx index 29ccf25e56e8..152e81fe2f19 100644 --- a/soldep/inc/soldep/depwin.hxx +++ b/soldep/inc/soldep/depwin.hxx @@ -72,6 +72,7 @@ public: void SetSelectedProject( ObjectWin* object ) { mpSelectedProject = object; }; ObjectWin* GetSelectedProject() { return mpSelectedProject; }; // DECL_LINK( PopupSelected, PopupMenu* ); + void DrawOutput( OutputDevice* pDevice, const Point& rOffset ); }; #endif diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx index cf95109b9e57..13568561c95d 100644 --- a/soldep/inc/soldep/objwin.hxx +++ b/soldep/inc/soldep/objwin.hxx @@ -138,6 +138,7 @@ public: virtual void LoseFocus(); BOOL ConnectionExistsInAnyDirection( ObjectWin *pWin ); + void DrawOutput( OutputDevice* pDevice, const Point& rOffset ); }; DECL_DEST_LIST( TmpObjWinList, ObjWinList, ObjectWin* ) diff --git a/soldep/inc/soldep/soldlg.hrc b/soldep/inc/soldep/soldlg.hrc index cf34292e777b..95bea8e50880 100644 --- a/soldep/inc/soldep/soldlg.hrc +++ b/soldep/inc/soldep/soldlg.hrc @@ -77,5 +77,6 @@ #define TID_SOLDEP_HIDE_INDEPENDEND (TID_SOLDEP_MAIN+4) #define TID_SOLDEP_SELECT_WORKSPACE (TID_SOLDEP_MAIN+5) #define TID_SOLDEP_BACK (TID_SOLDEP_MAIN+6) +#define TID_SOLDEP_CREATEMETA (TID_SOLDEP_MAIN+7) #define TID_SMALL_PIN_PINED (TID_SOLDEP_MAIN+100) #define TID_SMALL_PIN_UNPINED (TID_SOLDEP_MAIN+101) diff --git a/soldep/source/connctr.cxx b/soldep/source/connctr.cxx index d81a26f885ee..8eaba9ace236 100644 --- a/soldep/source/connctr.cxx +++ b/soldep/source/connctr.cxx @@ -121,25 +121,9 @@ void Connector::Paint( const Rectangle& rRect ) //SolDep *pSoldep = pApp->GetSolDep(); if (msbHideMode) { - /* - if ((mpStartWin->GetMarkMode() == 0) || (mpEndWin->GetMarkMode() == 0)) - { - //bVisible = FALSE; - UpdateVisibility(); - fprintf( ((MyApp*)GetpApp())->pDebugFile, "FALSE connctr: Start: %s %i - End: %s %i\n", - mpStartWin->GetBodyText().GetBuffer(),mpStartWin->GetMarkMode(), - mpEndWin->GetBodyText().GetBuffer(),mpEndWin->GetMarkMode()); - } else - { - bVisible = TRUE; - fprintf( ((MyApp*)GetpApp())->pDebugFile, "TRUE connctr: Start: %s %i - End: %s %i\n", - mpStartWin->GetBodyText().GetBuffer(),mpStartWin->GetMarkMode(), - mpEndWin->GetBodyText().GetBuffer(),mpEndWin->GetMarkMode()); - } - */ if (!(mpStartWin->IsNullObject())) //null_project { - if (mpStartWin->GetMarkMode() == 0) + if ( mpStartWin->GetMarkMode() == 0 || mpStartWin->GetMarkMode() == MARKMODE_DEPENDING ) { mpStartWin->SetViewMask(0); //objwin invisible } else @@ -149,7 +133,7 @@ void Connector::Paint( const Rectangle& rRect ) } if (!(mpEndWin->IsNullObject())) { - if (mpEndWin->GetMarkMode() == 0) + if ( mpEndWin->GetMarkMode() == 0 || mpEndWin->GetMarkMode() == MARKMODE_DEPENDING ) { mpEndWin->SetViewMask(0); //objwin invisible } else @@ -179,6 +163,18 @@ void Connector::Paint( const Rectangle& rRect ) } } +void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
+{
+ if ( (mpStartWin->GetBodyText() != ByteString("null")) && //null_project
+ (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible()) //null_project
+ {
+ pDevice->DrawLine( pDevice->PixelToLogic( mEnd ) - rOffset, pDevice->PixelToLogic( mStart ) - rOffset );
+ Rectangle aRect( pDevice->PixelToLogic( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2) ) ) );
+ aRect.Move( -rOffset.X(), -rOffset.Y() );
+ pDevice->DrawEllipse( aRect );
+ }
+}
+ void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint ) { // more than one call ? diff --git a/soldep/source/depapp.cxx b/soldep/source/depapp.cxx index aa448d8d688a..ab64557dbcf1 100644 --- a/soldep/source/depapp.cxx +++ b/soldep/source/depapp.cxx @@ -30,7 +30,8 @@ // ----------------------------------------------------------------------- #include "depapp.hxx" - +#include <ucbhelper/contentbroker.hxx>
+#include <ucbhelper/configurationkeys.hxx>
void MyApp::Main() { @@ -44,12 +45,12 @@ void MyApp::Main() // pToolBarFrame = new FloatingWindow( aMainWin, WB_STDWORK ); //pToolBox = new ToolBox(pToolBarFrame,DtSodResId(TID_SOLDEP_MAIN)); - pSolDep = new SolDep( &aMainWin ); pSolDep->Init(); aMainWin.SetText( String::CreateFromAscii( SOLDEPL_NAME )); - - aMainWin.Show(); Help aHelp; + pSolDep->Hide(); + aMainWin.Show(); + Help aHelp; SetHelp(&aHelp); aHelp.EnableContextHelp(); aHelp.EnableQuickHelp(); @@ -125,15 +126,24 @@ void MyWin::Resize() SAL_IMPLEMENT_MAIN() { - Reference< XMultiServiceFactory > xMS; + //Reference< XMultiServiceFactory > xMS; // for this to work make sure an <appname>.ini file is available, you can just copy soffice.ini Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext(); - xMS = cppu::createRegistryServiceFactory( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True ); + + //xMS = cppu::createRegistryServiceFactory( + // rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True ); + + Reference< XMultiServiceFactory > xMS( xComponentContext->getServiceManager(), UNO_QUERY); InitVCL( xMS ); ::comphelper::setProcessServiceFactory(xMS); + com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArgs(2); + aArgs[0] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
+ aArgs[1] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+ + ::ucbhelper::ContentBroker::initialize( xMS, aArgs );
+ aMyApp.Main(); DeInitVCL(); return 0; diff --git a/soldep/source/depper.cxx b/soldep/source/depper.cxx index 8f42ff7a864a..c6a4b4899d54 100644 --- a/soldep/source/depper.cxx +++ b/soldep/source/depper.cxx @@ -349,6 +349,17 @@ ULONG Depper::AddObjectToList( DepWin* pParentWin, ObjectList* pObjLst, ULONG &L return pWin->GetId(); } +/*void Depper::DrawOutput( OutputDevice* pDevice ) +{ + GetDepWin()->DrawOutput( pDevice ); + ObjectList* pObjList = GetObjectList(); + for ( USHORT i = pObjList->Count(); i > 0; i-- ) + { + ObjectWin* pWin = pObjList->GetObject( i - 1 ); + pWin->DrawOutput( pDevice ); + } +}*/ + ObjectWin* Depper::RemoveObjectFromList( ObjectList* pObjLst, ULONG &WinCount, USHORT nId, BOOL bDelete ) { ObjectWin* pWin = ObjIdToPtr( pObjLst, nId ); diff --git a/soldep/source/depwin.cxx b/soldep/source/depwin.cxx index 24cc78cef6f7..2f4fe79cf410 100644 --- a/soldep/source/depwin.cxx +++ b/soldep/source/depwin.cxx @@ -116,6 +116,21 @@ void DepWin::Paint( const Rectangle& rRect ) } } +void DepWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset ) +{ + ULONG i = 0; + ULONG nListCount = ConList.Count(); + + for ( i=0 ; i < nListCount ; i++ ) + { + ConList.GetObject( i )->DrawOutput( pDevice, rOffset ); + } + if ( mbStartNewCon ) + { + pDevice->DrawLine( maNewConStart, maNewConEnd ); + } +} + void DepWin::MouseButtonUp( const MouseEvent& rMEvt ) { if ( rMEvt.IsRight() ) diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk index 4801bc1e3119..63f6d422b6f5 100644 --- a/soldep/source/makefile.mk +++ b/soldep/source/makefile.mk @@ -70,6 +70,7 @@ SHL1STDLIBS = $(SVTOOLLIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ $(VCLLIB) \ + $(UCBHELPERLIB) \ $(SOTLIB) \ $(BTSTRPLIB) \ $(TOOLSLIB) \ @@ -109,6 +110,7 @@ APP1STDLIBS= \ $(SVTOOLLIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ + $(UCBHELPERLIB) \ $(VCLLIB) \ $(SOTLIB) \ $(BTSTRPLIB) \ diff --git a/soldep/source/objwin.cxx b/soldep/source/objwin.cxx index 286bf3c71a62..56eacedb4093 100644 --- a/soldep/source/objwin.cxx +++ b/soldep/source/objwin.cxx @@ -32,6 +32,7 @@ #include <tools/debug.hxx> #include <vcl/svapp.hxx> #include <vcl/help.hxx> +#include <vcl/wall.hxx>
#include <soldep/objwin.hxx> #include <soldep/depwin.hxx> @@ -96,10 +97,15 @@ ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle ) LINK( this, ObjectWin, TipHdl )); SetFont( Font( GetFont() ) ); + Font aFont( GetFont() );
+ Size aSize = aFont.GetSize();
+ aFont.SetSize( aSize );
+ SetFont( aFont ); + EnableClipSiblings(); SetZOrder( NULL, WINDOW_ZORDER_FIRST ); mpPopup = new PopupMenu(); -// mpPopup->InsertItem( OBJWIN_EDIT_TEXT, String::CreateFromAscii( "Details" )); + mpPopup->InsertItem( OBJWIN_EDIT_TEXT, String::CreateFromAscii( "Details" )); mpPopup->InsertItem( OBJWIN_ADD_CONNECTOR, String::CreateFromAscii( "New connection" )); mpPopup->InsertItem( OBJWIN_REMOVE_WIN, String::CreateFromAscii( "Remove object" )); mpPopup->InsertItem( OBJWIN_VIEW_CONTENT, String::CreateFromAscii( "View content" )); @@ -426,6 +432,9 @@ void ObjectWin::MarkNeeded( BOOL bReset ) void ObjectWin::MarkDepending( BOOL bReset ) /*****************************************************************************/ { + //if ( !bReset ) + // return; + Connector* pCon; ObjectWin* pWin; @@ -454,7 +463,6 @@ void ObjectWin::MarkDepending( BOOL bReset ) void ObjectWin::Paint( const Rectangle& rRect ) /*****************************************************************************/ { - Size aWinSize = PixelToLogic( GetOutputSizePixel() ); Size aTextSize; ByteString sbt = msBodyText; //debug @@ -474,6 +482,34 @@ void ObjectWin::Paint( const Rectangle& rRect ) DrawText( aPos , String( sbt, RTL_TEXTENCODING_UTF8 )); //debug } +void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
+/*****************************************************************************/
+{
+ Size aWinSize = PixelToLogic( GetSizePixel() );
+ Size aTextSize;
+ ByteString sbt = msBodyText;
+ aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));
+ aTextSize.Height() = GetTextHeight();
+ Point aPos = GetPosPixel();
+ Point aTextPos( aWinSize.Width() / 2 - aTextSize.Width() / 2,
+ aWinSize.Height() / 2 - aTextSize.Height() / 2 );
+ aTextPos += aPos;
+ aPos = pDevice->PixelToLogic( aPos ) - rOffset;
+ aTextPos = pDevice->PixelToLogic( aTextPos ) - rOffset;
+ if ( msBodyText !="null" )
+ {
+ pDevice->SetFillColor( GetBackground().GetColor() );
+ pDevice->DrawRect( Rectangle( aPos, pDevice->PixelToLogic( GetSizePixel() ) ) );
+ Font aFont( GetFont() );
+ Size aSize = aFont.GetSize();
+ aSize = pDevice->PixelToLogic( aSize );
+ aFont.SetSize( aSize );
+ pDevice->SetFont( aFont );
+ pDevice->SetTextColor( GetTextColor() );
+ pDevice->DrawText( aTextPos, String( sbt, RTL_TEXTENCODING_UTF8 ) );
+ }
+} + /*****************************************************************************/ void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt ) /*****************************************************************************/ @@ -538,7 +574,7 @@ void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt ) for( i = 0; i < mConnections.Count() ; i++ ) { - mpPopup->InsertItem( mnPopupStaticItems + i, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 )); + mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 )); } } mbMenuExecute = TRUE; @@ -644,7 +680,7 @@ IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l ) break; default : // DBG_ASSERT( FALSE, String (nItemId) ); - Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems ); + Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1); pCon = 0; // delete pCon; // mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId()); diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx index e6fe7272a61a..30e19985a9cf 100644 --- a/soldep/source/soldep.cxx +++ b/soldep/source/soldep.cxx @@ -36,6 +36,8 @@ #include <svtools/filedlg.hxx> #include <tools/iparser.hxx> #include <tools/geninfo.hxx> +#include <vcl/gdimtf.hxx>
+#include <vcl/bitmap.hxx>
#include <appdef.hxx> #include "time.h" #include <soldep/depper.hxx> @@ -172,7 +174,7 @@ void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent ) { // handle mouse click on ObjectWin object ObjectWin* pWin = (ObjectWin*) pChildWin; - GetObjectList()->ResetSelectedObject(); + //GetObjectList()->ResetSelectedObject(); if (IsHideMode()) // simple mouse click left { pWin->CaptureMouse(); @@ -250,9 +252,57 @@ IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox) case TID_SOLDEP_FIND: FindProject(); break; + case TID_SOLDEP_CREATEMETA :
+ {
+ VirtualDevice aVDev;
+ aVDev.SetMapMode( MAP_100TH_MM );
+ GDIMetaFile aMtf;
+ aVDev.EnableOutput( FALSE );
+ aMtf.Record( &aVDev );
+
+ aVDev.SetLineColor( Color( COL_BLACK ) );
+ aVDev.SetTextAlign( ALIGN_TOP );
+
+ Size aSize( GetDepWin()->GetOutputSizePixel() );
+ long nXMin = aSize.Width();
+ long nXMax = 0;
+ long nYMax = 0;
+ long nYMin = aSize.Height();
+
+ for ( USHORT i=0; i<mpObjectList->Count(); i++ )
+ {
+ Point aPoint = mpObjectList->GetObject(i)->GetPosPixel();
+ Size aSize = mpObjectList->GetObject(i)->GetSizePixel();
+ nXMin = MIN( aPoint.X(), nXMin );
+ nXMax = MAX( aPoint.X() + aSize.Width(), nXMax );
+ nYMin = MIN( aPoint.Y(), nYMin );
+ nYMax = MAX( aPoint.Y() + aSize.Height(), nYMax );
+ }
+
+ Point aOffset( nXMin, nYMin );
+ aOffset = aVDev.PixelToLogic( aOffset );
+
+ GetDepWin()->DrawOutput( &aVDev, aOffset );
+ for ( USHORT i=0; i<mpObjectList->Count(); i++ )
+ if ( mpObjectList->GetObject(i)->IsVisible() )
+ mpObjectList->GetObject(i)->DrawOutput( &aVDev, aOffset );
+
+ aMtf.Stop();
+ aMtf.WindStart();
+ aMtf.SetPrefMapMode( aVDev.GetMapMode() );
+ Size aDevSize( nXMax-nXMin + 10, nYMax-nYMin + 10);
+ aDevSize = aVDev.PixelToLogic( aDevSize );
+ aMtf.SetPrefSize( aDevSize );
+ SvFileStream aStream( String::CreateFromAscii("d:\\out.svm"), STREAM_STD_READWRITE );
+ aMtf.Write( aStream );
+ break;
+ } case TID_SOLDEP_HIDE_INDEPENDEND: { ToggleHideDependency(); + for ( USHORT i=0; i<mpObjectList->Count(); i++ )
+ mpObjectList->GetObject(i)->SetViewMask(!mbIsHide);
+ maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode()); GetDepWin()->Invalidate(); //repaint Main-View } @@ -559,7 +609,7 @@ USHORT SolDep::ReadSource(BOOL bUpdater) { pStr = pLst->GetObject(m); pHObject = mpSolIdMapper->Find( *pStr ); - if ( !pHObject ) + /*if ( !pHObject ) { // create new prj Prj *pNewPrj = new Prj( *pStr ); @@ -567,8 +617,10 @@ USHORT SolDep::ReadSource(BOOL bUpdater) nObjectId = AddObject( sPrjName, FALSE ); pHObject = mpSolIdMapper->Find( *pStr ); ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 2 ); - } + }*/ + if ( pHObject ) + { nHashedId = pHObject->GetId(); ByteString sF_Os2 = pPrj->GetProjectName(); pStr = &sF_Os2; @@ -580,6 +632,7 @@ USHORT SolDep::ReadSource(BOOL bUpdater) } } } + } if (!IsPrjView()) { AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) ); diff --git a/soldep/source/soldlg.src b/soldep/source/soldlg.src index be7f28f6bf20..9d9897971826 100644 --- a/soldep/source/soldlg.src +++ b/soldep/source/soldlg.src @@ -1,370 +1,377 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: soldlg.src,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <dtsodcmp.hrc> -#include <soldep/soldlg.hrc> - -//======================================================================== -// Dialogs -ModalDialog RID_SD_DIALOG_NEWPROJECT -{ - OutputSize = TRUE; - Text = "New Project"; - PosSize = MAP_SYSFONT(18,18,142,142); - SVLook = TRUE; - MOVEABLE = TRUE; - CLOSEABLE = TRUE; - OKButton BTN_OK - { - PosSize = MAP_SYSFONT(5,123,40,14); - TabStop = TRUE; - Hide = FALSE; - DefButton = TRUE; - }; - CancelButton BTN_CANCEL { - PosSize = MAP_SYSFONT(50,123,40,14); - TabStop = TRUE; - }; - FixedText FT_PRJNAME { - PosSize = MAP_SYSFONT( 5, 10, 100, 10 ); - Text = "Project Name"; - }; - Edit EDIT_PRJNAME { - Border = TRUE; - PosSize = MAP_SYSFONT(5,20,132,10); - }; - FixedText FT_PRJSHORT { - PosSize = MAP_SYSFONT( 5, 30, 100, 10 ); - Text = "Project Short Name"; - }; - Edit EDIT_PRJSHORT { - Border = TRUE; - PosSize = MAP_SYSFONT(5,40,132,10); - }; - FixedText FT_PRJDEPS { - PosSize = MAP_SYSFONT( 5, 50, 100, 10 ); - Text = "Project Depends on"; - }; - Edit EDIT_PRJDEPS { - Border = TRUE; - PosSize = MAP_SYSFONT(5,60,132,10); - }; -}; - -ModalDialog RID_SD_DIALOG_NEWDIRECTORY -{ - OutputSize = TRUE; - Text = "New Directory"; - PosSize = MAP_SYSFONT(18,18,142,142); - SVLook = TRUE; - MOVEABLE = TRUE; - CLOSEABLE = TRUE; - OKButton BTN_OK - { - PosSize = MAP_SYSFONT(5,123,40,14); - TabStop = TRUE; - Hide = FALSE; - DefButton = TRUE; - }; - CancelButton BTN_CANCEL { - PosSize = MAP_SYSFONT(50,123,40,14); - TabStop = TRUE; - }; - FixedText FT_DIRNAME { - PosSize = MAP_SYSFONT( 5, 10, 132, 10 ); - Text = "Directory Name ( with projectname )"; - }; - Edit EDIT_DIRNAME { - Border = TRUE; - PosSize = MAP_SYSFONT(5,20,132,10); - }; - FixedText FT_DIRFLAG { - PosSize = MAP_SYSFONT( 5, 30, 100, 10 ); - Text = "Directory Flag"; - }; - Edit EDIT_DIRFLAG { - Border = TRUE; - PosSize = MAP_SYSFONT(5,40,132,10); - }; - FixedText FT_DIRDEPS { - PosSize = MAP_SYSFONT( 5, 50, 100, 10 ); - Text = "Directory Depends on"; - }; - Edit EDIT_DIRDEPS { - Border = TRUE; - PosSize = MAP_SYSFONT(5,60,132,10); - }; - FixedText FT_DIRACTION { - PosSize = MAP_SYSFONT( 5, 70, 100, 10 ); - Text = "What To Do"; - }; - Edit EDIT_DIRACTION { - Border = TRUE; - PosSize = MAP_SYSFONT(5,80,132,10); - }; - FixedText FT_DIRENV { - PosSize = MAP_SYSFONT( 5, 90, 100, 10 ); - Text = "Which Environments"; - }; - Edit EDIT_DIRENV { - Border = TRUE; - PosSize = MAP_SYSFONT(5,100,132,10); - }; -}; - - -ModalDialog RID_SD_DIALOG_HELP -{ - OutputSize = TRUE; - Text = "Help"; - PosSize = MAP_SYSFONT(18,18,242,242); - SVLook = TRUE; - MOVEABLE = TRUE; - CLOSEABLE = TRUE; - OKButton BTN_OK - { - PosSize = MAP_SYSFONT(101,223,40,14); - TabStop = TRUE; - Hide = FALSE; - DefButton = TRUE; - }; - MultiLineEdit EDIT_HELP { - Border = TRUE; - PosSize = MAP_SYSFONT(5,5,232,213); - }; -}; - -ModalDialog DLG_VERSIONSELECT { - OutputSize = TRUE; - Pos = MAP_APPFONT( 92, 40 ); - Size = MAP_APPFONT( 161, 98 ); - Text = "Open workspace"; - Moveable = TRUE; - Closeable = TRUE; - ListBox DLG_VERSIONSELECT_LISTBOX { - Border = TRUE; - Pos = MAP_APPFONT( 8, 16 ); - Size = MAP_APPFONT( 96, 72 ); - TabStop = TRUE; - }; - GroupBox DLG_VERSIONSELECT_GROUP { - Pos = MAP_APPFONT( 4, 4 ); - Size = MAP_APPFONT( 104, 88 ); - Text = "Workspaces"; - }; - OKButton DLG_VERSIONSELECT_OK { - Pos = MAP_APPFONT( 116, 64 ); - Size = MAP_APPFONT( 40, 12 ); - DefButton = TRUE; - TabStop = TRUE; - }; - CancelButton DLG_VERSIONSELECT_CANCEL { - Pos = MAP_APPFONT( 116, 80 ); - Size = MAP_APPFONT( 40, 12 ); - TabStop = TRUE; - }; - GroupBox DLG_MINORSELECT_GROUP { - Pos = MAP_APPFONT( 110, 4 ); - Size = MAP_APPFONT( 47, 30 ); - Text = "Minor"; - }; - Edit DLG_MINORSELECT_EDIT { - Border = TRUE; - Pos = MAP_APPFONT( 115, 16 ); - Size = MAP_APPFONT( 36, 12 ); - TabStop = TRUE; - }; -}; - -ModelessDialog DLG_AUTOARRANGE { - OutputSize = TRUE; - Pos = MAP_APPFONT( 40, 12 ); - Size = MAP_APPFONT( 225, 82 ); - Text = "Autoarrange"; - Moveable = TRUE; - GroupBox DLG_AUTOARRANGE_GROUP { - Pos = MAP_APPFONT( 4, 4 ); - Size = MAP_APPFONT( 216, 72 ); - Text = "Progress"; - }; - FixedText DLG_AUTOARRANGE_TEXT_MODULE { - Pos = MAP_APPFONT( 8, 16 ); - Size = MAP_APPFONT( 208, 10 ); - Text = ""; - }; - FixedText DLG_AUTOARRANGE_TEXT_OVERALL { - Pos = MAP_APPFONT( 8, 48 ); - Size = MAP_APPFONT( 208, 10 ); - Text = ""; - }; -}; - -ModalDialog DLG_FIND_PROJECT { - OutputSize = TRUE; - Pos = MAP_APPFONT( 40, 12 ); - Size = MAP_APPFONT( 155, 55 ); - Text = "Find Project"; - Moveable = TRUE; - SVLook = TRUE; - ComboBox DLG_FIND_PROJECT_COMBOBOX - { - Pos = MAP_APPFONT ( 5 , 18 ) ; - Size = MAP_APPFONT ( 100 , 90 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - VScroll = TRUE ; - Sort = TRUE ; - }; - OKButton DLG_FIND_PROJECT_OK { - Pos = MAP_APPFONT( 110, 10 ); - Size = MAP_APPFONT( 40, 12 ); - DefButton = TRUE; - TabStop = TRUE; - }; - CancelButton DLG_FIND_PROJECT_CANCEL { - Pos = MAP_APPFONT( 110, 26 ); - Size = MAP_APPFONT( 40, 12 ); - TabStop = TRUE; - }; -}; - -ToolBox TID_SOLDEP_MAIN -{ - ButtonType = BUTTON_SYMBOL; - Align = BOXALIGN_TOP; - LineCount = 1; - SVLook = TRUE; - Border = TRUE; - Sizeable = TRUE; - Dockable = TRUE; - Scroll = TRUE; - Moveable = TRUE; - Closeable = TRUE; - Zoomable = TRUE; - ItemList = - { - ToolBoxItem - { - Identifier = TID_SOLDEP_OPEN; - Type = TOOLBOXITEM_BUTTON; - Text = "Load"; - HelpId = TID_SOLDEP_OPEN; - HelpText = "Load"; - Checkable = TRUE; - ItemBitmap = Bitmap - { - File = "sx03190.png"; - }; - }; - ToolBoxItem - { - Identifier = TID_SOLDEP_SAVE; - Type = TOOLBOXITEM_BUTTON; - Text = "Save"; - HelpId = TID_SOLDEP_SAVE; - HelpText = "Save"; - Checkable = TRUE; - ItemBitmap = Bitmap - { - File = "sc05505.png"; - }; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR; - }; - ToolBoxItem - { - Identifier = TID_SOLDEP_SELECT_WORKSPACE; - Type = TOOLBOXITEM_BUTTON; - Text = "Select Workspace"; - HelpId = TID_SOLDEP_HIDE_INDEPENDEND; - HelpText = "Select Workspace"; - Checkable = TRUE; - ItemBitmap = Bitmap - { - File = "selectupd_16.png"; - }; - }; - ToolBoxItem - { - Identifier = TID_SOLDEP_FIND; - Type = TOOLBOXITEM_BUTTON; - Text = "Find Module"; - HelpId = TID_SOLDEP_FIND; - HelpText = "Find Module"; - Checkable = TRUE; - ItemBitmap = Bitmap - { - File = "sc05961.png"; - }; - }; - ToolBoxItem - { - Identifier = TID_SOLDEP_BACK; - Type = TOOLBOXITEM_BUTTON; - Text = "Back to Overview"; - HelpId = TID_SOLDEP_BACK; - HelpText = "Back to Overview"; - Checkable = TRUE; - ItemBitmap = Bitmap - { - File = "arrowup_16.png"; - }; - }; - ToolBoxItem - { - Identifier = TID_SOLDEP_HIDE_INDEPENDEND; - Type = TOOLBOXITEM_BUTTON; - Text = "Hide Independend Modules"; - HelpId = TID_SOLDEP_HIDE_INDEPENDEND; - HelpText = "Hide Independend Modules"; - Checkable = TRUE; - ItemBitmap = Bitmap - { - File = "hidedependency_16.png"; - }; - }; - }; -}; - -/*****************************************************************************/ -Bitmap TID_SMALL_PIN_PINED -/*****************************************************************************/ -{ - File = "ballgreen_7.png"; -}; - -/*****************************************************************************/ -Bitmap TID_SMALL_PIN_UNPINED -/*****************************************************************************/ -{ - File = "ballred_7.png"; -}; +/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: soldlg.src,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <dtsodcmp.hrc>
+#include <soldep/soldlg.hrc>
+
+//========================================================================
+// Dialogs
+ModalDialog RID_SD_DIALOG_NEWPROJECT
+{
+ OutputSize = TRUE;
+ Text = "New Project";
+ PosSize = MAP_SYSFONT(18,18,142,142);
+ SVLook = TRUE;
+ MOVEABLE = TRUE;
+ CLOSEABLE = TRUE;
+ OKButton BTN_OK
+ {
+ PosSize = MAP_SYSFONT(5,123,40,14);
+ TabStop = TRUE;
+ Hide = FALSE;
+ DefButton = TRUE;
+ };
+ CancelButton BTN_CANCEL {
+ PosSize = MAP_SYSFONT(50,123,40,14);
+ TabStop = TRUE;
+ };
+ FixedText FT_PRJNAME {
+ PosSize = MAP_SYSFONT( 5, 10, 100, 10 );
+ Text = "Project Name";
+ };
+ Edit EDIT_PRJNAME {
+ Border = TRUE;
+ PosSize = MAP_SYSFONT(5,20,132,10);
+ };
+ FixedText FT_PRJSHORT {
+ PosSize = MAP_SYSFONT( 5, 30, 100, 10 );
+ Text = "Project Short Name";
+ };
+ Edit EDIT_PRJSHORT {
+ Border = TRUE;
+ PosSize = MAP_SYSFONT(5,40,132,10);
+ };
+ FixedText FT_PRJDEPS {
+ PosSize = MAP_SYSFONT( 5, 50, 100, 10 );
+ Text = "Project Depends on";
+ };
+ Edit EDIT_PRJDEPS {
+ Border = TRUE;
+ PosSize = MAP_SYSFONT(5,60,132,10);
+ };
+};
+
+ModalDialog RID_SD_DIALOG_NEWDIRECTORY
+{
+ OutputSize = TRUE;
+ Text = "New Directory";
+ PosSize = MAP_SYSFONT(18,18,142,142);
+ SVLook = TRUE;
+ MOVEABLE = TRUE;
+ CLOSEABLE = TRUE;
+ OKButton BTN_OK
+ {
+ PosSize = MAP_SYSFONT(5,123,40,14);
+ TabStop = TRUE;
+ Hide = FALSE;
+ DefButton = TRUE;
+ };
+ CancelButton BTN_CANCEL {
+ PosSize = MAP_SYSFONT(50,123,40,14);
+ TabStop = TRUE;
+ };
+ FixedText FT_DIRNAME {
+ PosSize = MAP_SYSFONT( 5, 10, 132, 10 );
+ Text = "Directory Name ( with projectname )";
+ };
+ Edit EDIT_DIRNAME {
+ Border = TRUE;
+ PosSize = MAP_SYSFONT(5,20,132,10);
+ };
+ FixedText FT_DIRFLAG {
+ PosSize = MAP_SYSFONT( 5, 30, 100, 10 );
+ Text = "Directory Flag";
+ };
+ Edit EDIT_DIRFLAG {
+ Border = TRUE;
+ PosSize = MAP_SYSFONT(5,40,132,10);
+ };
+ FixedText FT_DIRDEPS {
+ PosSize = MAP_SYSFONT( 5, 50, 100, 10 );
+ Text = "Directory Depends on";
+ };
+ Edit EDIT_DIRDEPS {
+ Border = TRUE;
+ PosSize = MAP_SYSFONT(5,60,132,10);
+ };
+ FixedText FT_DIRACTION {
+ PosSize = MAP_SYSFONT( 5, 70, 100, 10 );
+ Text = "What To Do";
+ };
+ Edit EDIT_DIRACTION {
+ Border = TRUE;
+ PosSize = MAP_SYSFONT(5,80,132,10);
+ };
+ FixedText FT_DIRENV {
+ PosSize = MAP_SYSFONT( 5, 90, 100, 10 );
+ Text = "Which Environments";
+ };
+ Edit EDIT_DIRENV {
+ Border = TRUE;
+ PosSize = MAP_SYSFONT(5,100,132,10);
+ };
+};
+
+
+ModalDialog RID_SD_DIALOG_HELP
+{
+ OutputSize = TRUE;
+ Text = "Help";
+ PosSize = MAP_SYSFONT(18,18,242,242);
+ SVLook = TRUE;
+ MOVEABLE = TRUE;
+ CLOSEABLE = TRUE;
+ OKButton BTN_OK
+ {
+ PosSize = MAP_SYSFONT(101,223,40,14);
+ TabStop = TRUE;
+ Hide = FALSE;
+ DefButton = TRUE;
+ };
+ MultiLineEdit EDIT_HELP {
+ Border = TRUE;
+ PosSize = MAP_SYSFONT(5,5,232,213);
+ };
+};
+
+ModalDialog DLG_VERSIONSELECT {
+ OutputSize = TRUE;
+ Pos = MAP_APPFONT( 92, 40 );
+ Size = MAP_APPFONT( 161, 98 );
+ Text = "Open workspace";
+ Moveable = TRUE;
+ Closeable = TRUE;
+ ListBox DLG_VERSIONSELECT_LISTBOX {
+ Border = TRUE;
+ Pos = MAP_APPFONT( 8, 16 );
+ Size = MAP_APPFONT( 96, 72 );
+ TabStop = TRUE;
+ };
+ GroupBox DLG_VERSIONSELECT_GROUP {
+ Pos = MAP_APPFONT( 4, 4 );
+ Size = MAP_APPFONT( 104, 88 );
+ Text = "Workspaces";
+ };
+ OKButton DLG_VERSIONSELECT_OK {
+ Pos = MAP_APPFONT( 116, 64 );
+ Size = MAP_APPFONT( 40, 12 );
+ DefButton = TRUE;
+ TabStop = TRUE;
+ };
+ CancelButton DLG_VERSIONSELECT_CANCEL {
+ Pos = MAP_APPFONT( 116, 80 );
+ Size = MAP_APPFONT( 40, 12 );
+ TabStop = TRUE;
+ };
+ GroupBox DLG_MINORSELECT_GROUP {
+ Pos = MAP_APPFONT( 110, 4 );
+ Size = MAP_APPFONT( 47, 30 );
+ Text = "Minor";
+ };
+ Edit DLG_MINORSELECT_EDIT {
+ Border = TRUE;
+ Pos = MAP_APPFONT( 115, 16 );
+ Size = MAP_APPFONT( 36, 12 );
+ TabStop = TRUE;
+ };
+};
+
+ModelessDialog DLG_AUTOARRANGE {
+ OutputSize = TRUE;
+ Pos = MAP_APPFONT( 40, 12 );
+ Size = MAP_APPFONT( 225, 82 );
+ Text = "Autoarrange";
+ Moveable = TRUE;
+ GroupBox DLG_AUTOARRANGE_GROUP {
+ Pos = MAP_APPFONT( 4, 4 );
+ Size = MAP_APPFONT( 216, 72 );
+ Text = "Progress";
+ };
+ FixedText DLG_AUTOARRANGE_TEXT_MODULE {
+ Pos = MAP_APPFONT( 8, 16 );
+ Size = MAP_APPFONT( 208, 10 );
+ Text = "";
+ };
+ FixedText DLG_AUTOARRANGE_TEXT_OVERALL {
+ Pos = MAP_APPFONT( 8, 48 );
+ Size = MAP_APPFONT( 208, 10 );
+ Text = "";
+ };
+};
+
+ModalDialog DLG_FIND_PROJECT {
+ OutputSize = TRUE;
+ Pos = MAP_APPFONT( 40, 12 );
+ Size = MAP_APPFONT( 155, 55 );
+ Text = "Find Project";
+ Moveable = TRUE;
+ SVLook = TRUE;
+ ComboBox DLG_FIND_PROJECT_COMBOBOX
+ {
+ Pos = MAP_APPFONT ( 5 , 18 ) ;
+ Size = MAP_APPFONT ( 100 , 90 ) ;
+ TabStop = TRUE ;
+ DropDown = TRUE ;
+ VScroll = TRUE ;
+ Sort = TRUE ;
+ };
+ OKButton DLG_FIND_PROJECT_OK {
+ Pos = MAP_APPFONT( 110, 10 );
+ Size = MAP_APPFONT( 40, 12 );
+ DefButton = TRUE;
+ TabStop = TRUE;
+ };
+ CancelButton DLG_FIND_PROJECT_CANCEL {
+ Pos = MAP_APPFONT( 110, 26 );
+ Size = MAP_APPFONT( 40, 12 );
+ TabStop = TRUE;
+ };
+};
+
+ToolBox TID_SOLDEP_MAIN
+{
+ ButtonType = BUTTON_SYMBOL;
+ Align = BOXALIGN_TOP;
+ LineCount = 1;
+ SVLook = TRUE;
+ Border = TRUE;
+ Sizeable = TRUE;
+ Dockable = TRUE;
+ Scroll = TRUE;
+ Moveable = TRUE;
+ Closeable = TRUE;
+ Zoomable = TRUE;
+ ItemList =
+ {
+ ToolBoxItem
+ {
+ Identifier = TID_SOLDEP_OPEN;
+ Type = TOOLBOXITEM_BUTTON;
+ Text = "Load";
+ HelpId = TID_SOLDEP_OPEN;
+ HelpText = "Load";
+ Checkable = TRUE;
+ ItemBitmap = Bitmap
+ {
+ File = "sx03190.png";
+ };
+ };
+ ToolBoxItem
+ {
+ Identifier = TID_SOLDEP_SAVE;
+ Type = TOOLBOXITEM_BUTTON;
+ Text = "Save";
+ HelpId = TID_SOLDEP_SAVE;
+ HelpText = "Save";
+ Checkable = TRUE;
+ ItemBitmap = Bitmap
+ {
+ File = "sc05505.png";
+ };
+ };
+ ToolBoxItem
+ {
+ Type = TOOLBOXITEM_SEPARATOR;
+ };
+ ToolBoxItem
+ {
+ Identifier = TID_SOLDEP_SELECT_WORKSPACE;
+ Type = TOOLBOXITEM_BUTTON;
+ Text = "Select Workspace";
+ HelpId = TID_SOLDEP_HIDE_INDEPENDEND;
+ HelpText = "Select Workspace";
+ Checkable = TRUE;
+ ItemBitmap = Bitmap
+ {
+ File = "selectupd_16.png";
+ };
+ };
+ ToolBoxItem
+ {
+ Identifier = TID_SOLDEP_FIND;
+ Type = TOOLBOXITEM_BUTTON;
+ Text = "Find Module";
+ HelpId = TID_SOLDEP_FIND;
+ HelpText = "Find Module";
+ Checkable = TRUE;
+ ItemBitmap = Bitmap
+ {
+ File = "sc05961.png";
+ };
+ };
+ ToolBoxItem
+ {
+ Identifier = TID_SOLDEP_BACK;
+ Type = TOOLBOXITEM_BUTTON;
+ Text = "Back to Overview";
+ HelpId = TID_SOLDEP_BACK;
+ HelpText = "Back to Overview";
+ Checkable = TRUE;
+ ItemBitmap = Bitmap
+ {
+ File = "arrowup_16.png";
+ };
+ };
+ ToolBoxItem
+ {
+ Identifier = TID_SOLDEP_HIDE_INDEPENDEND;
+ Type = TOOLBOXITEM_BUTTON;
+ Text = "Hide Independend Modules";
+ HelpId = TID_SOLDEP_HIDE_INDEPENDEND;
+ HelpText = "Hide Independend Modules";
+ Checkable = TRUE;
+ ItemBitmap = Bitmap
+ {
+ File = "hidedependency_16.png";
+ };
+ };
+ ToolBoxItem
+ {
+ Identifier = TID_SOLDEP_CREATEMETA;
+ Type = TOOLBOXITEM_BUTTON;
+ Text = "Create MetaFile";
+ Checkable = TRUE;
+ };
+ };
+};
+
+/*****************************************************************************/
+Bitmap TID_SMALL_PIN_PINED
+/*****************************************************************************/
+{
+ File = "ballgreen_7.png";
+};
+
+/*****************************************************************************/
+Bitmap TID_SMALL_PIN_UNPINED
+/*****************************************************************************/
+{
+ File = "ballred_7.png";
+};
|