vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'work/icon'

Browse Source
This commit is contained in:
Erik Faye-Lund 2010-11-23 22:00:33 +01:00
commit 7590f5c6c6
6 changed files with 132 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
contrib/logo.svg Normal file
View File

@ -0,0 +1,110 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
version="1.1" width="128" height="128" id="GNU Rocket logo">
<style type="text/css" >
<![CDATA[
.flap {
fill: url(#flap-grad);
stroke: #500;
stroke-width: 1;
stroke-linecap: butt;
stroke-linejoin: round;
stroke-miterlimit: 4;
}
.cflap {
fill: url(#mid-flap-grad);
stroke: #500;
stroke-width: 1;
stroke-linejoin: round;
}
.outline {
fill: none;
stroke: #444;
stroke-width: 1;
stroke-linecap: butt;
stroke-linejoin: round;
}
]]>
</style>
<defs>
<linearGradient x1="0" y1="0" x2="0" y2="1" id="body-grad">
<stop style="stop-color:#c00" offset=".319" />
<stop style="stop-color:#ccc" offset=".32" />
<stop style="stop-color:#777" offset="1" />
</linearGradient>
<linearGradient id="flap-grad">
<stop style="stop-color:#c00" offset="0" />
<stop style="stop-color:#800" offset="1" />
</linearGradient>
<linearGradient x1="0" y1="0" x2="0" y2="1" id="mid-flap-grad">
<stop style="stop-color:#500" offset=".25" />
<stop style="stop-color:#c00" offset=".26" />
</linearGradient>
<linearGradient x1="0" y1="0" x2="0" y2="1" id="hilight-grad">
<stop style="stop-color:#fff" offset="0" />
<stop style="stop-color:#fff;stop-opacity:0"
offset="1" />
</linearGradient>
<radialGradient cx=".5" cy=".5" r=".5" id="shadow-grad">
<stop offset="0" />
<stop style="stop-opacity:0" offset="1" />
</radialGradient>
<radialGradient cx=".55" cy="-.01" r=".3"
id="body-radial-grad"
gradientTransform="rotate(40) scale(1,1.7) ">
<stop style="stop-color:#fff" offset="0" />
<stop style="stop-color:#fff;stop-opacity:.5"
offset=".3" />
<stop style="stop-color:#fff;stop-opacity:.125"
offset="1" />
</radialGradient>
<filter x="0" y="-.36" width="1.17" height="1.7"
color-interpolation-filters="sRGB" id="shadow-filter">
<feGaussianBlur stdDeviation="1.77" />
</filter>
<path d="m-19,37c-6,-62 -2,-67 19,-97 21,30 25,35 19,97z"
id="body" />
<path d="m0,0 -20,20 0,-44 20,-20z" id="flap-path" />
<path d="m0,0 l12,-12q0,25 -12,50z"
id="flap-hilight-path" />
<clipPath id="clip-body">
<use xlink:href="#body" />
</clipPath>
</defs>
<g transform="translate(64,64)">
<ellipse cx="0" cy="53" rx="37" ry="5" opacity=".5"
fill="url(#shadow-grad)" filter="url(#shadow-filter)" />
<!-- left and right flaps -->
<use xlink:href="#flap-path" class="flap"
transform="translate(-19,37)"/>
<use xlink:href="#flap-path" class="flap"
transform="translate(19,37) scale(-1,1)"/>
<use xlink:href="#flap-hilight-path" opacity=".25"
fill="url(#hilight-grad)" transform="translate(-37,13)" />
<use xlink:href="#flap-hilight-path" opacity=".25"
fill="url(#hilight-grad)"
transform="translate(37,13) scale(-1,1)" />
<!-- body -->
<use xlink:href="#body" fill="url(#body-grad)" />
<ellipse cx="-5" cy="-23" rx="25" ry="40"
fill="url(#body-radial-grad)"
clip-path="url(#clip-body)" />
<path opacity=".4" fill="url(#hilight-grad)"
d="m-14,40c-10,-65 -2,-70 13.5,-98 11,28 16,33 6,98z" />
<use xlink:href="#body" class="outline" />
<!-- center flap -->
<path d="m-3,-2 6,0 0,60 -6,0z" class="cflap" />
<path d="m-2,14 4,0 -4,40z" fill="url(#hilight-grad)"
opacity=".4" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
editor/appicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 345 KiB

8
editor/editor.cpp
View File

@ -519,20 +519,20 @@ static LRESULT CALLBACK mainWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
static ATOM registerMainWindowClass(HINSTANCE hInstance) static ATOM registerMainWindowClass(HINSTANCE hInstance)
{ {
WNDCLASSEXW wc; WNDCLASSEXW wc;
wc.cbSize = sizeof(wc); wc.cbSize = sizeof(wc);
wc.style = 0; wc.style = 0;
wc.lpfnWndProc = mainWindowProc; wc.lpfnWndProc = mainWindowProc;
wc.cbClsExtra = 0; wc.cbClsExtra = 0;
wc.cbWndExtra = 0; wc.cbWndExtra = 0;
wc.hInstance = hInstance; wc.hInstance = hInstance;
wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); wc.hIcon = LoadIcon(hInstance, IDI_APPLICATION);
wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hCursor = LoadCursor(NULL, IDC_ARROW);
wc.hbrBackground = (HBRUSH)0; wc.hbrBackground = (HBRUSH)0;
wc.lpszMenuName = MAKEINTRESOURCEW(IDR_MENU); wc.lpszMenuName = MAKEINTRESOURCEW(IDR_MENU);
wc.lpszClassName = mainWindowClassName; wc.lpszClassName = mainWindowClassName;
wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION); wc.hIconSm = wc.hIcon;
return RegisterClassExW(&wc); return RegisterClassExW(&wc);
} }

9
editor/editor.rc
View File

@ -162,6 +162,15 @@ BEGIN
END END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_APPLICATION ICON "appicon.ico"
#endif // Norwegian (Bokmal) resources #endif // Norwegian (Bokmal) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

12
editor/editor.vcproj
View File

@ -183,6 +183,10 @@
> >
</File> </File>
<File <File
RelativePath=".\editor.cpp"
>
</File>
<File
RelativePath=".\recentfiles.cpp" RelativePath=".\recentfiles.cpp"
> >
</File> </File>
@ -191,10 +195,6 @@
> >
</File> </File>
<File <File
RelativePath=".\editor.cpp"
>
</File>
<File
RelativePath="..\sync\track.c" RelativePath="..\sync\track.c"
> >
</File> </File>
@ -250,6 +250,10 @@
RelativePath=".\editor.rc" RelativePath=".\editor.rc"
> >
</File> </File>
<File
RelativePath=".\appicon.ico"
>
</File>
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>

6
editor/resource.h
View File

@ -6,23 +6,19 @@
#define IDR_MENU 102 #define IDR_MENU 102
#define IDD_SETROWS 103 #define IDD_SETROWS 103
#define IDD_BIASSELECTION 104 #define IDD_BIASSELECTION 104
#define IDC_EDIT 1002 #define IDC_EDIT 1002
#define IDC_SETROWS_EDIT 1002 #define IDC_SETROWS_EDIT 1002
#define IDC_BIASSELECTION_EDIT 1003 #define IDC_BIASSELECTION_EDIT 1003
#define ID_FILE 40001 #define ID_FILE 40001
#define ID_FILE_EXIT 40002 #define ID_FILE_EXIT 40002
#define ID_FILE_REMOTEEXPORT 40003 #define ID_FILE_REMOTEEXPORT 40003
#define ID_FILE_RECENTFILES 40004 #define ID_FILE_RECENTFILES 40004
#define ID_RECENTFILES_NORECENTFILES 40010 #define ID_RECENTFILES_NORECENTFILES 40010
#define ID_RECENTFILES_FILE1 40011 #define ID_RECENTFILES_FILE1 40011
#define ID_RECENTFILES_FILE2 40012 #define ID_RECENTFILES_FILE2 40012
#define ID_RECENTFILES_FILE3 40013 #define ID_RECENTFILES_FILE3 40013
#define ID_RECENTFILES_FILE4 40014 #define ID_RECENTFILES_FILE4 40014
#define ID_RECENTFILES_FILE5 40015 #define ID_RECENTFILES_FILE5 40015
#define ID_EDIT 40020 #define ID_EDIT 40020
#define ID_EDIT_SETROWS 40021 #define ID_EDIT_SETROWS 40021
#define ID_EDIT_BIAS 40022 #define ID_EDIT_BIAS 40022
@ -34,7 +30,7 @@
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 104 #define _APS_NEXT_RESOURCE_VALUE 105
#define _APS_NEXT_COMMAND_VALUE 40026 #define _APS_NEXT_COMMAND_VALUE 40026
#define _APS_NEXT_CONTROL_VALUE 1004 #define _APS_NEXT_CONTROL_VALUE 1004
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101