data: added tooltip view css file to windows installer

* also renamed css file for tooltip view to conform to names of other css files
This commit is contained in:
malte_langkabel
2017-08-08 17:12:47 +02:00
parent 43c647e2d2
commit 42fc52b8f7
4 changed files with 10 additions and 5 deletions
+6 -3
View File
@@ -661,14 +661,18 @@
</Component> </Component>
</Directory> </Directory>
<Directory Id='DataUndoRedoView' Name='undoredo_view'> <Directory Id='DataTooltipView' Name='tooltip_view'>
<Component Id='TooltipViewCss' Guid='*' Win64="$(var.Win64)">
<File Id='TooltipView' Name='tooltip_view.css' DiskId='1' Source='./../../../bin/app/data/gui/tooltip_view/tooltip_view.css' KeyPath='yes' />
</Component>
</Directory>
<Directory Id='DataUndoRedoView' Name='undoredo_view'>
<Component Id='UndoRedoViewCss' Guid='*' Win64="$(var.Win64)"> <Component Id='UndoRedoViewCss' Guid='*' Win64="$(var.Win64)">
<File Id='UndoRedoView' Name='undoredo_view.css' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/undoredo_view.css' KeyPath='yes' /> <File Id='UndoRedoView' Name='undoredo_view.css' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/undoredo_view.css' KeyPath='yes' />
</Component> </Component>
<Directory Id='DataUndoRedoViewImages' Name='images'> <Directory Id='DataUndoRedoViewImages' Name='images'>
<Component Id='ArrowLeftPng' Guid='*' Win64="$(var.Win64)"> <Component Id='ArrowLeftPng' Guid='*' Win64="$(var.Win64)">
<File Id='ArrowLeft' Name='arrow_left.png' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/images/arrow_left.png' KeyPath='yes' /> <File Id='ArrowLeft' Name='arrow_left.png' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/images/arrow_left.png' KeyPath='yes' />
</Component> </Component>
@@ -678,7 +682,6 @@
<Component Id='HistoryPng' Guid='*' Win64="$(var.Win64)"> <Component Id='HistoryPng' Guid='*' Win64="$(var.Win64)">
<File Id='History' Name='history.png' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/images/history.png' KeyPath='yes' /> <File Id='History' Name='history.png' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/images/history.png' KeyPath='yes' />
</Component> </Component>
</Directory> </Directory>
</Directory> </Directory>
@@ -358,6 +358,8 @@
<ComponentRef Id='TabbedViewCss'/> <ComponentRef Id='TabbedViewCss'/>
<ComponentRef Id='TooltipViewCss'/>
<ComponentRef Id='UndoRedoViewCss'/> <ComponentRef Id='UndoRedoViewCss'/>
<ComponentRef Id='ArrowLeftPng'/> <ComponentRef Id='ArrowLeftPng'/>
<ComponentRef Id='ArrowRightPng'/> <ComponentRef Id='ArrowRightPng'/>
+1 -1
View File
@@ -72,6 +72,6 @@ bool QtTooltipView::tooltipVisible() const
void QtTooltipView::setStyleSheet() void QtTooltipView::setStyleSheet()
{ {
m_widget->setStyleSheet( m_widget->setStyleSheet(
utility::getStyleSheet(ResourcePaths::getGuiPath().concat(FilePath("tooltip_view/tooltip.css"))).c_str() utility::getStyleSheet(ResourcePaths::getGuiPath().concat(FilePath("tooltip_view/tooltip_view.css"))).c_str()
); );
} }