ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: Fixes for release

Browse Source 
* reduced contrast for overview bundle starting character titles
* put 3rd party licenses into Mac bundle
* check edges for 'importing files' bundle as well in case node types are not set
This commit is contained in:
Eberhard Graether
2017-02-14 23:44:27 +01:00
parent 3359f25427
commit fcac720ea9
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/app/data/color_schemes/bad_rainbow.xml
+3 -3
View File
@@ -383,7 +383,7 @@
<normal>transparent</normal>
</fill>
<text>
<normal>white</normal>
<normal>#B1B1B1</normal>
</text>
</text>
</node>
@@ -455,7 +455,7 @@
<hover>#878787</hover>
<text>#878787</text>
</tab>
<bookmark>
<button>
<icon>black</icon>
@@ -463,5 +463,5 @@
<icon_hover>white</icon_hover>
</button>
</bookmark>
</config>
bin/app/data/color_schemes/bright.xml
+1 -1
View File
@@ -354,7 +354,7 @@
<normal>transparent</normal>
</fill>
<text>
<normal>black</normal>
<normal>#B2B2B2</normal>
</text>
</text>
</node>
bin/app/data/color_schemes/dark.xml
+3 -3
View File
@@ -357,7 +357,7 @@
<normal>transparent</normal>
</fill>
<text>
<normal>white</normal>
<normal>#777777</normal>
</text>
</text>
</node>
@@ -429,7 +429,7 @@
<hover>#878787</hover>
<text>#878787</text>
</tab>
<bookmark>
<button>
<icon>black</icon>
@@ -437,5 +437,5 @@
<icon_hover>white</icon_hover>
</button>
</bookmark>
</config>
setup/MacOSX/bundle_install.sh.in
+2
View File
@@ -90,6 +90,8 @@ mkdir -p $RES_DIR/user/log
cp ../../../bin/app/user/window_settings.ini $RES_DIR/user/window_settings.ini
cp ../../../bin/app/data/fallback/ApplicationSettings.xml $RES_DIR/user/ApplicationSettings.xml
cp -R ../../../bin/app/data/3rd_party_licenses $BIN_DIR/3rd_party_licenses
echo -e $INFO "Copying dynamic libraries."
for LIB_PATH in ${DYNLIB_PATHS[@]}
do
src/lib/component/controller/GraphController.cpp
+3 -1
View File
@@ -746,7 +746,9 @@ void GraphController::bundleNodes()
bool fileOrMacroActive = false;
for (std::shared_ptr<DummyNode> node : m_dummyNodes)
{
if (node->bundleInfo.isActive && node->data->isType(Node::NODE_FILE | Node::NODE_MACRO))
if (node->bundleInfo.isActive && (
node->data->isType(Node::NODE_FILE | Node::NODE_MACRO) ||
node->data->findEdgeOfType(Edge::EDGE_INCLUDE | Edge::EDGE_MACRO_USAGE) != nullptr))
{
fileOrMacroActive = true;
break;