From 618d5d2348efe54a36bf5727af37950a289c314c Mon Sep 17 00:00:00 2001 From: "PANIK\\chris" Date: Wed, 13 Aug 2025 21:02:07 +0200 Subject: [PATCH] new model structure works for now. --- src/application/xqappdata.cpp | 335 ++++++++++++++++--------------- src/application/xqmainmodel.cpp | 2 +- src/application/xqmainwindow.cpp | 5 +- xml/modelsheets.xml | 19 +- 4 files changed, 181 insertions(+), 180 deletions(-) diff --git a/src/application/xqappdata.cpp b/src/application/xqappdata.cpp index d2851f3..7cc6c9e 100644 --- a/src/application/xqappdata.cpp +++ b/src/application/xqappdata.cpp @@ -31,7 +31,7 @@ namespace XQAppData } - /* + class XQAppIconMap : public QMap { public: @@ -40,7 +40,86 @@ namespace XQAppData void init() { - + insert( "DirIcon" , QApplication::style()->standardIcon(QStyle::SP_DirIcon)); + insert( "FileDialogBack", QApplication::style()->standardIcon(QStyle::SP_FileDialogBack)); + insert( "FileDialogContentsView", QApplication::style()->standardIcon(QStyle::SP_FileDialogContentsView)); + insert( "FileDialogDetailedView", QApplication::style()->standardIcon(QStyle::SP_FileDialogDetailedView)); + insert( "icn05Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogEnd)); + insert( "icn06Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogInfoView)); + insert( "icn07Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogListView)); + insert( "icn08Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogNewFolder)); + insert( "icn09Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogStart)); + insert( "icn10Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogToParent)); + insert( "icn11Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowBack)); + insert( "icn12Dummy", QApplication::style()->standardIcon(QStyle::SP_DirIcon)); + insert( "icn13Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSkipBackward)); + insert( "icn14Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowDown)); + insert( "icn15Dummy", QApplication::style()->standardIcon(QStyle::SP_DirLinkIcon)); + insert( "icn16Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSkipForward)); + insert( "icn17Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowForward)); + insert( "icn18Dummy", QApplication::style()->standardIcon(QStyle::SP_DirOpenIcon)); + insert( "icn19Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaStop)); + insert( "icn20Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowLeft)); + insert( "icn21Dummy", QApplication::style()->standardIcon(QStyle::SP_DockWidgetCloseButton)); + insert( "icn22Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaVolume)); + insert( "icn23Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowRight)); + insert( "icn24Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveCDIcon)); + insert( "icn25Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaVolumeMuted)); + insert( "icn26Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowUp)); + insert( "icn27Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveDVDIcon)); + insert( "icn28Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical)); + insert( "icn29Dummy", QApplication::style()->standardIcon(QStyle::SP_BrowserReload)); + insert( "icn30Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveFDIcon)); + insert( "icn31Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation)); + insert( "icn32Dummy", QApplication::style()->standardIcon(QStyle::SP_BrowserStop)); + insert( "icn33Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveHDIcon)); + insert( "icn34Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxQuestion)); + insert( "icn35Dummy", QApplication::style()->standardIcon(QStyle::SP_CommandLink)); + insert( "icn36Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveNetIcon)); + insert( "icn37Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning)); + insert( "icn38Dummy", QApplication::style()->standardIcon(QStyle::SP_ComputerIcon)); + insert( "icn39Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogBack)); + insert( "icn40Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarCloseButton)); + insert( "icn41Dummy", QApplication::style()->standardIcon(QStyle::SP_CustomBase)); + insert( "icn42Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogContentsView)); + insert( "icn43Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarContextHelpButton)); + insert( "icn44Dummy", QApplication::style()->standardIcon(QStyle::SP_DesktopIcon)); + insert( "icn45Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogDetailedView)); + insert( "icn46Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMaxButton)); + insert( "icn47Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogApplyButton)); + insert( "icn48Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogEnd)); + insert( "icn49Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMenuButton)); + insert( "icn50Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogCancelButton)); + insert( "icn51Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogInfoView)); + insert( "icn52Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMinButton)); + insert( "icn53Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogCloseButton)); + insert( "icn54Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogListView)); + insert( "icn55Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarNormalButton)); + insert( "icn56Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogDiscardButton)); + insert( "icn57Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogNewFolder)); + insert( "icn58Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarShadeButton)); + insert( "icn59Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogHelpButton)); + insert( "icn60Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogStart)); + insert( "icn61Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarUnshadeButton)); + insert( "icn62Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogNoButton)); + insert( "icn63Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogToParent)); + insert( "icn64Dummy", QApplication::style()->standardIcon(QStyle::SP_ToolBarHorizontalExtensionButton)); + insert( "icn65Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogOkButton)); + insert( "FileIcon", QApplication::style()->standardIcon(QStyle::SP_FileIcon)); + insert( "icn67Dummy", QApplication::style()->standardIcon(QStyle::SP_ToolBarVerticalExtensionButton)); + insert( "icn68Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogResetButton)); + insert( "icn70Dummy", QApplication::style()->standardIcon(QStyle::SP_FileLinkIcon)); + insert( "TrashIcon", QApplication::style()->standardIcon(QStyle::SP_TrashIcon)); + insert( "icn72Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogSaveButton)); + insert( "icn73Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaPause)); + insert( "icn74Dummy", QApplication::style()->standardIcon(QStyle::SP_VistaShield)); + insert( "icn75Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogYesButton)); + insert( "icn76Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaPlay)); + insert( "icn77Dummy", QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon)); + insert( "icn79Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSeekBackward)); + insert( "DirHomeIcon", QApplication::style()->standardIcon(QStyle::SP_DirHomeIcon)); + insert( "icn81Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSeekForward)); + /* auto from = to_underlying(QIcon::ThemeIcon::AddressBookNew); auto to = to_underlying(QIcon::ThemeIcon::NThemeIcons); for (auto i = from; i < to; ++i) @@ -51,102 +130,30 @@ namespace XQAppData if (!icon.isNull()) insert(icon.name(), icon); } + */ } }; - */ - using XQAppIconMap=QMap; + + + /* + Nein, so nicht! QApplication::style() gibts hier noch nicht -> aua! static XQAppIconMap s_IconMap { - { "icnFolder" , QApplication::style()->standardIcon(QStyle::SP_DirIcon) }, - { "icn02Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogBack)}, - { "icn03Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogContentsView)}, - { "icn04Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogDetailedView)}, - { "icn05Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogEnd)}, - { "icn06Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogInfoView)}, - { "icn07Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogListView)}, - { "icn08Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogNewFolder)}, - { "icn09Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogStart)}, - { "icn10Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogToParent)}, - { "icn11Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowBack)}, - { "icn12Dummy", QApplication::style()->standardIcon(QStyle::SP_DirIcon)}, - { "icn13Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSkipBackward)}, - { "icn14Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowDown)}, - { "icn15Dummy", QApplication::style()->standardIcon(QStyle::SP_DirLinkIcon)}, - { "icn16Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSkipForward)}, - { "icn17Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowForward)}, - { "icn18Dummy", QApplication::style()->standardIcon(QStyle::SP_DirOpenIcon)}, - { "icn19Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaStop)}, - { "icn20Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowLeft)}, - { "icn21Dummy", QApplication::style()->standardIcon(QStyle::SP_DockWidgetCloseButton)}, - { "icn22Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaVolume)}, - { "icn23Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowRight)}, - { "icn24Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveCDIcon)}, - { "icn25Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaVolumeMuted)}, - { "icn26Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowUp)}, - { "icn27Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveDVDIcon)}, - { "icn28Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical)}, - { "icn29Dummy", QApplication::style()->standardIcon(QStyle::SP_BrowserReload)}, - { "icn30Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveFDIcon)}, - { "icn31Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation)}, - { "icn32Dummy", QApplication::style()->standardIcon(QStyle::SP_BrowserStop)}, - { "icn33Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveHDIcon)}, - { "icn34Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxQuestion)}, - { "icn35Dummy", QApplication::style()->standardIcon(QStyle::SP_CommandLink)}, - { "icn36Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveNetIcon)}, - { "icn37Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning)}, - { "icn38Dummy", QApplication::style()->standardIcon(QStyle::SP_ComputerIcon)}, - { "icn39Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogBack)}, - { "icn40Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarCloseButton)}, - { "icn41Dummy", QApplication::style()->standardIcon(QStyle::SP_CustomBase)}, - { "icn42Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogContentsView)}, - { "icn43Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarContextHelpButton)}, - { "icn44Dummy", QApplication::style()->standardIcon(QStyle::SP_DesktopIcon)}, - { "icn45Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogDetailedView)}, - { "icn46Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMaxButton)}, - { "icn47Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogApplyButton)}, - { "icn48Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogEnd)}, - { "icn49Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMenuButton)}, - { "icn50Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogCancelButton)}, - { "icn51Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogInfoView)}, - { "icn52Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMinButton)}, - { "icn53Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogCloseButton)}, - { "icn54Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogListView)}, - { "icn55Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarNormalButton)}, - { "icn56Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogDiscardButton)}, - { "icn57Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogNewFolder)}, - { "icn58Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarShadeButton)}, - { "icn59Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogHelpButton)}, - { "icn60Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogStart)}, - { "icn61Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarUnshadeButton)}, - { "icn62Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogNoButton)}, - { "icn63Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogToParent)}, - { "icn64Dummy", QApplication::style()->standardIcon(QStyle::SP_ToolBarHorizontalExtensionButton)}, - { "icn65Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogOkButton)}, - { "icn66Dummy", QApplication::style()->standardIcon(QStyle::SP_FileIcon)}, - { "icn67Dummy", QApplication::style()->standardIcon(QStyle::SP_ToolBarVerticalExtensionButton)}, - { "icn68Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogResetButton)}, - { "icn70Dummy", QApplication::style()->standardIcon(QStyle::SP_FileLinkIcon)}, - { "icn71Dummy", QApplication::style()->standardIcon(QStyle::SP_TrashIcon)}, - { "icn72Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogSaveButton)}, - { "icn73Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaPause)}, - { "icn74Dummy", QApplication::style()->standardIcon(QStyle::SP_VistaShield)}, - { "icn75Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogYesButton)}, - { "icn76Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaPlay)}, - { "icn77Dummy", QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon)}, - { "icn79Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSeekBackward)}, - { "icn80Dummy", QApplication::style()->standardIcon(QStyle::SP_DirHomeIcon)}, - { "icn81Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSeekForward)} - }; + { "icnFolder" , QApplication::style()->standardIcon(QStyle::SP_DirIcon) } + } + */ + static XQAppIconMap s_IconMap; + bool hasTypeIcon(const QString& key ) { - //if(s_IconMap.isEmpty()) - // s_IconMap.init(); + if(s_IconMap.isEmpty()) + s_IconMap.init(); return !key.isEmpty() && s_IconMap.contains(key); } @@ -160,84 +167,84 @@ namespace XQAppData /* { "icnFolder" , QApplication::style()->standardIcon(QStyle::SP_DirIcon) }, - { "icnFolder" , QApplication::style()->standardIcon(QStyle::SP_DirIcon)}, - { "icn02Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogBack)}, - { "icn03Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogContentsView)}, - { "icn04Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogDetailedView)}, - { "icn05Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogEnd)}, - { "icn06Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogInfoView)}, - { "icn07Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogListView)}, - { "icn08Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogNewFolder)}, - { "icn09Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogStart)}, - { "icn10Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogToParent)}, - { "icn11Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowBack)}, - { "icn12Dummy", QApplication::style()->standardIcon(QStyle::SP_DirIcon)}, - { "icn13Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSkipBackward)}, - { "icn14Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowDown)}, - { "icn15Dummy", QApplication::style()->standardIcon(QStyle::SP_DirLinkIcon)}, - { "icn16Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSkipForward)}, - { "icn17Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowForward)}, - { "icn18Dummy", QApplication::style()->standardIcon(QStyle::SP_DirOpenIcon)}, - { "icn19Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaStop)}, - { "icn20Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowLeft)}, - { "icn21Dummy", QApplication::style()->standardIcon(QStyle::SP_DockWidgetCloseButton)}, - { "icn22Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaVolume)}, - { "icn23Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowRight)}, - { "icn24Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveCDIcon)}, - { "icn25Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaVolumeMuted)}, - { "icn26Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowUp)}, - { "icn27Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveDVDIcon)}, - { "icn28Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical)}, - { "icn29Dummy", QApplication::style()->standardIcon(QStyle::SP_BrowserReload)}, - { "icn30Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveFDIcon)}, - { "icn31Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation)}, - { "icn32Dummy", QApplication::style()->standardIcon(QStyle::SP_BrowserStop)}, - { "icn33Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveHDIcon)}, - { "icn34Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxQuestion)}, - { "icn35Dummy", QApplication::style()->standardIcon(QStyle::SP_CommandLink)}, - { "icn36Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveNetIcon)}, - { "icn37Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning)}, - { "icn38Dummy", QApplication::style()->standardIcon(QStyle::SP_ComputerIcon)}, - { "icn39Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogBack)}, - { "icn40Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarCloseButton)}, - { "icn41Dummy", QApplication::style()->standardIcon(QStyle::SP_CustomBase)}, - { "icn42Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogContentsView)}, - { "icn43Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarContextHelpButton)}, - { "icn44Dummy", QApplication::style()->standardIcon(QStyle::SP_DesktopIcon)}, - { "icn45Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogDetailedView)}, - { "icn46Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMaxButton)}, - { "icn47Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogApplyButton)}, - { "icn48Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogEnd)}, - { "icn49Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMenuButton)}, - { "icn50Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogCancelButton)}, - { "icn51Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogInfoView)}, - { "icn52Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMinButton)}, - { "icn53Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogCloseButton)}, - { "icn54Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogListView)}, - { "icn55Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarNormalButton)}, - { "icn56Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogDiscardButton)}, - { "icn57Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogNewFolder)}, - { "icn58Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarShadeButton)}, - { "icn59Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogHelpButton)}, - { "icn60Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogStart)}, - { "icn61Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarUnshadeButton)}, - { "icn62Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogNoButton)}, - { "icn63Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogToParent)}, - { "icn64Dummy", QApplication::style()->standardIcon(QStyle::SP_ToolBarHorizontalExtensionButton)}, - { "icn65Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogOkButton)}, - { "icn66Dummy", QApplication::style()->standardIcon(QStyle::SP_FileIcon)}, - { "icn67Dummy", QApplication::style()->standardIcon(QStyle::SP_ToolBarVerticalExtensionButton)}, - { "icn68Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogResetButton)}, - { "icn70Dummy", QApplication::style()->standardIcon(QStyle::SP_FileLinkIcon)}, - { "icn71Dummy", QApplication::style()->standardIcon(QStyle::SP_TrashIcon)}, - { "icn72Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogSaveButton)}, - { "icn73Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaPause)}, - { "icn74Dummy", QApplication::style()->standardIcon(QStyle::SP_VistaShield)}, - { "icn75Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogYesButton)}, - { "icn76Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaPlay)}, - { "icn77Dummy", QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon)}, - { "icn79Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSeekBackward)}, - { "icn80Dummy", QApplication::style()->standardIcon(QStyle::SP_DirHomeIcon)}, + { "icnFolder" , QApplication::style()->standardIcon(QStyle::SP_DirIcon"); + { "icn02Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogBack"); + { "icn03Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogContentsView"); + { "icn04Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogDetailedView"); + { "icn05Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogEnd"); + { "icn06Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogInfoView"); + { "icn07Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogListView"); + { "icn08Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogNewFolder"); + { "icn09Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogStart"); + { "icn10Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogToParent"); + { "icn11Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowBack"); + { "icn12Dummy", QApplication::style()->standardIcon(QStyle::SP_DirIcon"); + { "icn13Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSkipBackward"); + { "icn14Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowDown"); + { "icn15Dummy", QApplication::style()->standardIcon(QStyle::SP_DirLinkIcon"); + { "icn16Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSkipForward"); + { "icn17Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowForward"); + { "icn18Dummy", QApplication::style()->standardIcon(QStyle::SP_DirOpenIcon"); + { "icn19Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaStop"); + { "icn20Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowLeft"); + { "icn21Dummy", QApplication::style()->standardIcon(QStyle::SP_DockWidgetCloseButton"); + { "icn22Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaVolume"); + { "icn23Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowRight"); + { "icn24Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveCDIcon"); + { "icn25Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaVolumeMuted"); + { "icn26Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowUp"); + { "icn27Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveDVDIcon"); + { "icn28Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical"); + { "icn29Dummy", QApplication::style()->standardIcon(QStyle::SP_BrowserReload"); + { "icn30Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveFDIcon"); + { "icn31Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation"); + { "icn32Dummy", QApplication::style()->standardIcon(QStyle::SP_BrowserStop"); + { "icn33Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveHDIcon"); + { "icn34Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxQuestion"); + { "icn35Dummy", QApplication::style()->standardIcon(QStyle::SP_CommandLink"); + { "icn36Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveNetIcon"); + { "icn37Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning"); + { "icn38Dummy", QApplication::style()->standardIcon(QStyle::SP_ComputerIcon"); + { "icn39Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogBack"); + { "icn40Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarCloseButton"); + { "icn41Dummy", QApplication::style()->standardIcon(QStyle::SP_CustomBase"); + { "icn42Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogContentsView"); + { "icn43Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarContextHelpButton"); + { "icn44Dummy", QApplication::style()->standardIcon(QStyle::SP_DesktopIcon"); + { "icn45Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogDetailedView"); + { "icn46Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMaxButton"); + { "icn47Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogApplyButton"); + { "icn48Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogEnd"); + { "icn49Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMenuButton"); + { "icn50Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogCancelButton"); + { "icn51Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogInfoView"); + { "icn52Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMinButton"); + { "icn53Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogCloseButton"); + { "icn54Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogListView"); + { "icn55Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarNormalButton"); + { "icn56Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogDiscardButton"); + { "icn57Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogNewFolder"); + { "icn58Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarShadeButton"); + { "icn59Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogHelpButton"); + { "icn60Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogStart"); + { "icn61Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarUnshadeButton"); + { "icn62Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogNoButton"); + { "icn63Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogToParent"); + { "icn64Dummy", QApplication::style()->standardIcon(QStyle::SP_ToolBarHorizontalExtensionButton"); + { "icn65Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogOkButton"); + { "icn66Dummy", QApplication::style()->standardIcon(QStyle::SP_FileIcon"); + { "icn67Dummy", QApplication::style()->standardIcon(QStyle::SP_ToolBarVerticalExtensionButton"); + { "icn68Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogResetButton"); + { "icn70Dummy", QApplication::style()->standardIcon(QStyle::SP_FileLinkIcon"); + { "icn71Dummy", QApplication::style()->standardIcon(QStyle::SP_TrashIcon"); + { "icn72Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogSaveButton"); + { "icn73Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaPause"); + { "icn74Dummy", QApplication::style()->standardIcon(QStyle::SP_VistaShield"); + { "icn75Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogYesButton"); + { "icn76Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaPlay"); + { "icn77Dummy", QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon"); + { "icn79Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSeekBackward"); + { "icn80Dummy", QApplication::style()->standardIcon(QStyle::SP_DirHomeIcon"); { "icn81Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSeekForward)} } */ diff --git a/src/application/xqmainmodel.cpp b/src/application/xqmainmodel.cpp index a3d96b6..d8378c0 100644 --- a/src/application/xqmainmodel.cpp +++ b/src/application/xqmainmodel.cpp @@ -39,7 +39,7 @@ XQMainModel::XQMainModel(QObject *parent ) void XQMainModel::initModel(const QString& modelName) { - // model rootnode finden -> + // model rootnode finden -> XQNodePtr modelSheet = _itemFactory.findModelSheet( modelName ); // throws // #1: über alle sections diff --git a/src/application/xqmainwindow.cpp b/src/application/xqmainwindow.cpp index 37f8297..73f56b7 100644 --- a/src/application/xqmainwindow.cpp +++ b/src/application/xqmainwindow.cpp @@ -85,11 +85,10 @@ void XQMainWindow::initMainWindow() // hand over left side navigation tree _mainModelView.setTreeTable(_mainTreeView); // #1. init the left side main tree view - //_mainModelView.initModel( c_MainModelName ); - _mainModelView.initModel( "ModelX" ); + _mainModelView.initModel( c_MainModelName ); // #2. load demo data - //loadDocument( c_DocumentFileName1 ); + loadDocument( c_DocumentFileName1 ); //loadDocument( c_DocumentFileName2 ); qDebug() << " --- all here: " << XQNode::s_Count; diff --git a/xml/modelsheets.xml b/xml/modelsheets.xml index 10aa97e..39d9351 100644 --- a/xml/modelsheets.xml +++ b/xml/modelsheets.xml @@ -7,7 +7,7 @@ --> - + @@ -23,10 +23,10 @@ DocumentTreeModel --> - + + - +
@@ -73,7 +67,8 @@
- + +