Skip to content

Commit

Permalink
Update Clouds location
Browse files Browse the repository at this point in the history 
Changed back the Clouds image location as it interfered with the HTML
and ODT layout files.
  • Loading branch information
@ptulp
ptulp committed Mar 14, 2015
1 parent dbcfe18 commit 7281cd1
Show file tree
Hide file tree
Showing 14 changed files with 4 additions and 196 deletions.
0 data/Clouds/altocumulus.jpg → Layouts/Clouds/altocumulus.jpg
View file
File renamed without changes
0 data/Clouds/altostratus.jpg → Layouts/Clouds/altostratus.jpg
View file
File renamed without changes
0 data/Clouds/cirrocumulus.jpg → Layouts/Clouds/cirrocumulus.jpg
View file
File renamed without changes
0 data/Clouds/cirrostratus.jpg → Layouts/Clouds/cirrostratus.jpg
View file
File renamed without changes
0 data/Clouds/cirrus.jpg → Layouts/Clouds/cirrus.jpg
View file
File renamed without changes
0 data/Clouds/cumulonimbus.jpg → Layouts/Clouds/cumulonimbus.jpg
View file
File renamed without changes
0 data/Clouds/cumulus.jpg → Layouts/Clouds/cumulus.jpg
View file
File renamed without changes
0 data/Clouds/nimbostratus.jpg → Layouts/Clouds/nimbostratus.jpg
View file
File renamed without changes
0 data/Clouds/nocloud.jpg → Layouts/Clouds/nocloud.jpg
View file
File renamed without changes
0 data/Clouds/stratocumulus.jpg → Layouts/Clouds/stratocumulus.jpg
View file
File renamed without changes
0 data/Clouds/stratus.jpg → Layouts/Clouds/stratus.jpg
View file
File renamed without changes
193 changes: 0 additions & 193 deletions buildosx/InstallOSX/logbookkonni_pi.pkgproj.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -761,199 +761,6 @@
<dict>
<key>CHILDREN</key>
<array>
<dict>
<key>CHILDREN</key>
<array>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../data/Clouds/altocumulus.jpg</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../data/Clouds/altostratus.jpg</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../data/Clouds/cirrocumulus.jpg</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../data/Clouds/cirrostratus.jpg</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../data/Clouds/cirrus.jpg</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../data/Clouds/cumulonimbus.jpg</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../data/Clouds/cumulus.jpg</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../data/Clouds/nimbostratus.jpg</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../data/Clouds/nocloud.jpg</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../data/Clouds/stratocumulus.jpg</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../data/Clouds/stratus.jpg</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
<integer>420</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
</array>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>Clouds</string>
<key>PATH_TYPE</key>
<integer>0</integer>
<key>PERMISSIONS</key>
<integer>509</integer>
<key>TYPE</key>
<integer>2</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>
Expand Down
3 changes: 2 additions & 1 deletion makezip.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@ rm -f build/LogbookKonni_Languages.zip
rm -f build/LogbookKonni_Layouts.zip
(
cd Layouts
zip -r ../build/LogbookKonni_Layouts.zip HTMLLayouts ODTLayouts
zip -r ../build/LogbookKonni_Layouts.zip HTMLLayouts ODTLayouts Clouds

)
4 changes: 2 additions & 2 deletions src/LogbookDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <wx/dirdlg.h>
#include <wx/splitter.h>
#include <wx/treectrl.h>
#include "wx/stdpaths.h"
#include "wx/stdpaths.h"
#include "wx/fileconf.h"
#include <wx/image.h>
#include <wx/fs_inet.h>
Expand Down Expand Up @@ -4568,7 +4568,7 @@ void LogbookDialog::m_gridGlobalOnGridCellRightClick( wxGridEvent& ev )
{
m_menu1->PrependSeparator();
wxString s = wxFileName::GetPathSeparator();
clouds_locn = *GetpSharedDataLocation() + _T("plugins") + s + _T("logbookkonni_pi") + s + _T("data") + s + _T("Clouds") + s;
clouds_locn = data + _T("Clouds") + s;

for(int i = 0; i < 10; i++)
{
Expand Down

0 comments on commit 7281cd1

Please sign in to comment.