diff --git a/Timeline/TLE.fl b/Timeline/TLE.fl index 950890f..98ab4b9 100644 --- a/Timeline/TLE.fl +++ b/Timeline/TLE.fl @@ -161,7 +161,7 @@ Loggable::progress_callback( &TLE::progress_cb, this );} {} } { Fl_Window main_window { label Timeline open - xywh {279 117 1025 770} type Double resizable xclass Non_DAW visible + xywh {254 117 1025 770} type Double resizable xclass Non_DAW visible } { Fl_Menu_Bar menubar {open xywh {0 0 1024 25} @@ -705,14 +705,14 @@ if ( engine->zombified() && ! zombie ) Function {make_about_dialog()} {} { Fl_Window about_dialog_window { label About open - private xywh {758 335 495 600} type Double xclass {Non-DAW} visible + private xywh {664 192 495 655} type Double xclass {Non-DAW} visible } { Fl_Tabs {} {open - xywh {0 213 497 392} + xywh {0 264 497 392} } { Fl_Group {} { label Credits open - xywh {2 237 492 362} + xywh {2 293 492 362} } { Fl_Box {} { label {Non-DAW was written from scratch by @@ -723,16 +723,16 @@ Nobody planned. Nobody helped. You can help now by donating time, money, and/or replacing the rest of Linux Audio with fast, light, reliable alternatives.} - xywh {39 266 418 262} box ROUNDED_BOX color 46 labelsize 18 + xywh {39 322 418 262} box ROUNDED_BOX color 46 labelsize 18 } } Fl_Group {} { label License open - xywh {2 237 492 362} hide + xywh {2 288 492 311} hide } { Fl_Box {} { label {Copyright (C) 2008 Jonathan Moore Liles} - xywh {43 246 410 37} labeltype SHADOW_LABEL labelfont 1 labelsize 18 + xywh {43 302 410 37} labeltype SHADOW_LABEL labelfont 1 labelsize 18 } Fl_Box {} { label {This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. @@ -740,20 +740,20 @@ with fast, light, reliable alternatives.} This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.} - xywh {10 295 475 233} box ROUNDED_BOX color 46 labelfont 1 labelsize 12 labelcolor 53 align 144 + xywh {10 351 475 233} box ROUNDED_BOX color 46 labelfont 1 labelsize 12 labelcolor 53 align 144 } } } Fl_Box {} { label VERSION - xywh {25 11 445 151} box ROUNDED_BOX color 48 labelfont 1 labelsize 18 align 16 + xywh {25 20 445 180} box ROUNDED_BOX color 48 labelfont 1 labelsize 18 align 16 code0 {o->image( Fl_Shared_Image::get( INSTALL_PREFIX "/share/pixmaps/non-daw/logo.png" ) );} code1 {o->label( VERSION );} } Fl_Return_Button {} { label Rock callback {about_dialog_window->hide();} - xywh {400 558 76 30} + xywh {400 614 76 30} } Fl_Button {} { label {http://non-daw.tuxfamily.org} @@ -763,11 +763,11 @@ You should have received a copy of the GNU General Public License along with thi \#else fl_open_uri( "http://non-daw.tuxfamily.org" ); \#endif} - xywh {125 558 245 30} color 14 labeltype SHADOW_LABEL labelcolor 6 + xywh {125 614 245 30} color 14 labeltype SHADOW_LABEL labelcolor 6 } Fl_Box {} { label {The Non DAW (Digital Audio Workstation)} - xywh {32 176 430 29} labeltype SHADOW_LABEL labelfont 3 labelsize 17 + xywh {32 221 430 29} labeltype SHADOW_LABEL labelfont 3 labelsize 17 } } } @@ -836,13 +836,11 @@ if ( r < 0 ) const char *s = Project::errstr( r ); fl_alert( "Could not open project \\"%s\\":\\n\\n\\t%s", name, s ); -}} {selected - } +}} {} } } -class New_Project_Dialog {open -} { +class New_Project_Dialog {} { Function {New_Project_Dialog()} {open } { code {make_window();} {} @@ -911,7 +909,7 @@ while ( _window->shown() ) } } -Function {new_project_chooser()} {open C return_type void +Function {new_project_chooser()} {C return_type void } { code {New_Project_Dialog nsd; @@ -935,7 +933,7 @@ while ( window->shown() ) } { Fl_Window window { label {Project info} open - private xywh {649 226 520 625} type Double modal visible + private xywh {649 226 520 740} type Double modal visible } { Fl_Value_Output {} { label {Sample Rate} @@ -968,13 +966,13 @@ while ( window->shown() ) } Fl_Box {} { label {} - xywh {51 194 418 154} box ROUNDED_BOX color 53 labelfont 1 labelsize 18 align 16 + xywh {51 180 418 235} box ROUNDED_BOX color 53 labelfont 1 labelsize 18 align 16 code0 {o->image( Fl_Shared_Image::get( INSTALL_PREFIX "/share/pixmaps/non-daw/logo2.png" ) );} code1 {o->label( NULL );} } Fl_Text_Editor notes_field { - label {Notes:} - private xywh {20 395 480 185} color 47 selection_color 31 textsize 18 textcolor 92 + label {Notes:} selected + private xywh {20 445 480 245} color 47 selection_color 31 textsize 18 textcolor 92 code0 {o->buffer( new Fl_Text_Buffer() );} code1 {o->buffer()->loadfile( "notes" );} } @@ -983,7 +981,7 @@ while ( window->shown() ) callback {notes_field->buffer()->savefile( "notes" ); window->hide();} - xywh {425 590 74 25} + xywh {425 700 74 25} } Fl_Box {} { label {Project Info} @@ -996,7 +994,7 @@ window->hide();} Fl_Button {} { label {&Discard} callback {window->hide();} - xywh {330 590 74 25} + xywh {330 700 74 25} } } } diff --git a/pixmaps/Makefile b/pixmaps/Makefile new file mode 100644 index 0000000..eef6a50 --- /dev/null +++ b/pixmaps/Makefile @@ -0,0 +1,6 @@ + +%.png : %.svg + convert -background none $< -scale 256 -colors 256 -quality 0 $@ + +all: logo.png logo2.png + diff --git a/pixmaps/logo.png b/pixmaps/logo.png index bc02925..33f7b2f 100644 Binary files a/pixmaps/logo.png and b/pixmaps/logo.png differ diff --git a/pixmaps/logo.svg b/pixmaps/logo.svg index c71f781..7559479 100644 --- a/pixmaps/logo.svg +++ b/pixmaps/logo.svg @@ -9,12 +9,12 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="744.09448" - height="1052.3622" + width="510.89719" + height="272.32346" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" - sodipodi:docname="logo-small.svg" + sodipodi:docname="logo.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/home/male/prog/non-daw/logo-small.png" inkscape:export-xdpi="90" @@ -189,13 +189,13 @@ gridtolerance="10000" guidetolerance="10" objecttolerance="10" - inkscape:pageopacity="0.0" + inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="0.49497475" - inkscape:cx="894.44558" - inkscape:cy="426.64664" + inkscape:zoom="0.98994949" + inkscape:cx="338.09431" + inkscape:cy="37.537015" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="layer4" showgrid="false" showguides="true" inkscape:guide-bbox="true" @@ -219,16 +219,17 @@ inkscape:groupmode="layer" id="layer4" inkscape:label="Box" - style="display:inline"> + style="display:inline" + transform="translate(705.05389,101.71135)"> + width="510.89719" + height="272.32346" + x="-705.05389" + y="-101.71135" + rx="10.606599" + ry="163.41496" /> + rx="3.6658518" + ry="4.6712651" + transform="matrix(2.893352,0,0,2.5949782,-936.52939,-653.88701)" /> + id="layer3" + transform="translate(705.05389,101.71135)"> + transform="matrix(0.4079323,0,0,0.4763895,-720.38277,-211.01945)" /> + transform="matrix(0.5464111,0,0,0.6970126,-679.23684,-139.87262)" /> + style="display:inline" + transform="translate(705.05389,101.71135)"> Non + x="-671.73907" + y="16.766323">Non DAW + x="-640.53522" + y="77.315681">DAW + style="display:inline" + transform="translate(705.05389,101.71135)"> + transform="matrix(0.394954,0,0,0.4763895,-587.52772,-50.201036)" /> + transform="matrix(0.2153846,2.1562228e-2,-2.7931991e-2,0.3364082,-596.32318,-129.04055)" /> + rx="3.6658518" + ry="4.6712651" + transform="matrix(2.893352,0,0,2.5949782,-231.47552,-552.17566)" /> diff --git a/pixmaps/logo2.png b/pixmaps/logo2.png index d1605f8..14768fc 100644 Binary files a/pixmaps/logo2.png and b/pixmaps/logo2.png differ diff --git a/pixmaps/logo2.svg b/pixmaps/logo2.svg index 2a3da6a..9d7ffeb 100644 --- a/pixmaps/logo2.svg +++ b/pixmaps/logo2.svg @@ -9,8 +9,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="744.09448819" - height="1052.3622047" + width="552.5625" + height="435.375" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" @@ -18,7 +18,8 @@ inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/home/male/prog/non-daw/logo2.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-ydpi="90" + version="1.0"> + width="1.2715164" + y="-0.82689118" + height="2.6537824"> @@ -122,7 +123,8 @@ + id="layer3" + transform="translate(-95.15625,-223.25)"> + style="display:inline" + transform="translate(-95.15625,-223.25)"> + style="display:inline" + transform="translate(-95.15625,-223.25)">