r168 - in trunk/src/target/OM-2007: . applications/openmoko-chordmaster devel/qmake libraries/mokoui
mickey at gta01.hmw-consulting.de
mickey at gta01.hmw-consulting.de
Wed Nov 1 02:44:12 CET 2006
Author: mickey
Date: 2006-11-01 01:44:08 +0000 (Wed, 01 Nov 2006)
New Revision: 168
Added:
trunk/src/target/OM-2007/applications/openmoko-chordmaster/fretboard.png
Modified:
trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c
trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.h
trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c
trunk/src/target/OM-2007/libraries/mokoui/moko-toolbox.c
trunk/src/target/OM-2007/makevars.sh
Log:
chordmaster: add fretboard and display in details area
Added: trunk/src/target/OM-2007/applications/openmoko-chordmaster/fretboard.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/target/OM-2007/applications/openmoko-chordmaster/fretboard.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c 2006-10-31 02:29:11 UTC (rev 167)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c 2006-11-01 01:44:08 UTC (rev 168)
@@ -96,6 +96,7 @@
g_signal_connect( G_OBJECT(d->window), "delete_event", G_CALLBACK( gtk_main_quit ), NULL );
populate_navigation_area( d );
+ populate_details_area( d );
/* toolboox */
@@ -132,10 +133,6 @@
gtk_menu_shell_append( GTK_MENU_SHELL(actionmenu), GTK_WIDGET(baritem) );
moko_pixmap_button_set_menu( MOKO_PIXMAP_BUTTON(button3), actionmenu );
gtk_widget_show_all( actionmenu );
-
- /* details area */
- GtkLabel* details = gtk_label_new( "Add your widget for showing\ndetails for the selected\ndata entry here" );
- moko_paned_window_set_lower_pane( d->window, GTK_WIDGET(details) );
}
void populate_navigation_area( ChordMasterData* d )
@@ -193,3 +190,51 @@
gtk_scrolled_window_add_with_viewport( scrollwin, GTK_WIDGET(view) );
moko_paned_window_set_upper_pane( d->window, GTK_WIDGET(scrollwin) );
}
+
+gboolean
+ expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data);
+
+void populate_details_area( ChordMasterData* d )
+{
+/* GtkImage* image = gtk_image_new_from_file( RESOURCE_PATH "fretboard.png" );
+ GdkPixbuf* pixbuf = gtk_image_get_pixbuf( image );*/
+
+ GtkWidget* drawing_area = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (drawing_area, 450, 348);
+ g_signal_connect (G_OBJECT (drawing_area), "expose_event",
+ G_CALLBACK (expose_event_callback), NULL);
+
+
+ moko_paned_window_set_lower_pane( d->window, GTK_WIDGET(drawing_area) );
+}
+
+/* fretboard widget */
+
+gboolean
+ expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+{
+ g_debug( "expose event callback" );
+ GError* error = NULL;
+
+ GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file( RESOURCE_PATH "fretboard.png", &error );
+ gdk_draw_pixbuf( widget->window,
+ widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+ pixbuf,
+ 0,
+ 0,
+ 20,
+ 0,
+ -1,
+ -1,
+ GDK_RGB_DITHER_MAX,
+ 0,
+ 0);
+
+ /*gdk_draw_arc (widget->window,
+ widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+ TRUE,
+ 0, 0, widget->allocation.width, widget->allocation.height,
+ 0, 64 * 360);*/
+ return TRUE;
+}
+
Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.h 2006-10-31 02:29:11 UTC (rev 167)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.h 2006-11-01 01:44:08 UTC (rev 168)
@@ -33,3 +33,4 @@
void setup_ui( ChordMasterData* );
void populate_navigation_area( ChordMasterData* d );
+void populate_details_area( ChordMasterData* d );
Modified: trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
===================================================================
--- trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2006-10-31 02:29:11 UTC (rev 167)
+++ trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2006-11-01 01:44:08 UTC (rev 168)
@@ -58,4 +58,14 @@
DESTDIR = $(OPENMOKODIR)/lib
}
+contains( CONFIG, debug ) {
+ APPDIR = $(OPENMOKODIR)/applications/$$TARGET
+ DEFINES += RESOURCE_PATH=\\\"$$APPDIR/\\\"
+}
+!contains( CONFIG, debug ) {
+ APPDIR = /usr/share/$$TARGET
+ DEFINES += RESOURCE_PATH=\\\"$$APPDIR/\\\"
+}
+
+
DEFINES += G_LOG_DOMAIN=\\\"$$TARGET\\\"
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c 2006-10-31 02:29:11 UTC (rev 167)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-menubox.c 2006-11-01 01:44:08 UTC (rev 168)
@@ -150,7 +150,7 @@
return FALSE;
}
}
- g_debug( "Jenseits von Gut und Böse..." );
+ g_debug( "Jenseits von Gut und B�e..." );
return TRUE;
}
Modified: trunk/src/target/OM-2007/libraries/mokoui/moko-toolbox.c
===================================================================
--- trunk/src/target/OM-2007/libraries/mokoui/moko-toolbox.c 2006-10-31 02:29:11 UTC (rev 167)
+++ trunk/src/target/OM-2007/libraries/mokoui/moko-toolbox.c 2006-11-01 01:44:08 UTC (rev 168)
@@ -144,7 +144,7 @@
priv->entry = gtk_entry_new();
gtk_entry_set_has_frame( priv->entry, FALSE );
- gtk_entry_set_inner_border( priv->entry, FALSE );
+ // gtk_entry_set_inner_border( priv->entry, FALSE );
gtk_widget_set_name( GTK_WIDGET(priv->entry), "mokotoolbox-search-entry" );
moko_pixmap_container_set_cargo( priv->searchbar_page, GTK_WIDGET(priv->entry) );
@@ -187,4 +187,4 @@
gtk_box_pack_start( GTK_BOX(priv->buttonbox), GTK_WIDGET(button), FALSE, FALSE, 0 );
return button;
-}
\ No newline at end of file
+}
Modified: trunk/src/target/OM-2007/makevars.sh
===================================================================
--- trunk/src/target/OM-2007/makevars.sh 2006-10-31 02:29:11 UTC (rev 167)
+++ trunk/src/target/OM-2007/makevars.sh 2006-11-01 01:44:08 UTC (rev 168)
@@ -3,7 +3,7 @@
find . -name "Makefile"|xargs rm -f
rm -rf ./lib/lib*
rm -rf ./bin/*-*
-/usr/lib/qt4/bin/qmake
+qmake
make clean
export LD_LIBRARY_PATH=$OPENMOKODIR/lib
More information about the commitlog
mailing list
