mirror of https://github.com/PCSX2/pcsx2.git
gsdx-ogl: All the Windows versions get a fancy logo on top, so...
git-svn-id: http://pcsx2.googlecode.com/svn/branches/gsdx-ogl@5059 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
009f6e2dcb
commit
8bb44cfcac
|
@ -146,6 +146,7 @@ set(GSdxHeaders
|
||||||
GSDrawingEnvironment.h
|
GSDrawingEnvironment.h
|
||||||
GSDump.h
|
GSDump.h
|
||||||
GSFunctionMap.h
|
GSFunctionMap.h
|
||||||
|
GSLinuxLogo.h
|
||||||
GSLocalMemory.h
|
GSLocalMemory.h
|
||||||
GSPerfMon.h
|
GSPerfMon.h
|
||||||
GSRasterizer.h
|
GSRasterizer.h
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
#include "GSdx.h"
|
#include "GSdx.h"
|
||||||
|
#include "GSLinuxLogo.h"
|
||||||
|
|
||||||
static void SysMessage(const char *fmt, ...)
|
static void SysMessage(const char *fmt, ...)
|
||||||
{
|
{
|
||||||
|
@ -179,6 +180,9 @@ bool RunLinuxDialog()
|
||||||
GtkWidget *interlace_label, *threads_label, *native_label, *msaa_label, *rexy_label, *render_label;
|
GtkWidget *interlace_label, *threads_label, *native_label, *msaa_label, *rexy_label, *render_label;
|
||||||
int return_value;
|
int return_value;
|
||||||
|
|
||||||
|
GdkPixbuf* logo_pixmap;
|
||||||
|
GtkWidget *logo_image;
|
||||||
|
|
||||||
/* Create the widgets */
|
/* Create the widgets */
|
||||||
dialog = gtk_dialog_new_with_buttons (
|
dialog = gtk_dialog_new_with_buttons (
|
||||||
"GSdx Config",
|
"GSdx Config",
|
||||||
|
@ -210,6 +214,12 @@ bool RunLinuxDialog()
|
||||||
sw_frame = gtk_frame_new ("Software Mode Settings");
|
sw_frame = gtk_frame_new ("Software Mode Settings");
|
||||||
gtk_container_add(GTK_CONTAINER(sw_frame), sw_box);
|
gtk_container_add(GTK_CONTAINER(sw_frame), sw_box);
|
||||||
|
|
||||||
|
// Grab a logo, to make things look nice.
|
||||||
|
logo_pixmap = gdk_pixbuf_from_pixdata(&gsdx_ogl_logo, false, NULL);
|
||||||
|
logo_image = gtk_image_new_from_pixbuf(logo_pixmap);
|
||||||
|
//gtk_container_add(GTK_CONTAINER(main_box), logo_image);
|
||||||
|
gtk_box_pack_start(GTK_BOX(main_box), logo_image, true, true, 0);
|
||||||
|
|
||||||
// Create the renderer combo box and label, and stash them in a box.
|
// Create the renderer combo box and label, and stash them in a box.
|
||||||
render_label = gtk_label_new ("Renderer:");
|
render_label = gtk_label_new ("Renderer:");
|
||||||
render_combo_box = CreateRenderComboBox();
|
render_combo_box = CreateRenderComboBox();
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
After Width: | Height: | Size: 73 KiB |
Loading…
Reference in New Issue