Просмотр исходного кода

tools: set application and about dialog logo from icon theme

Daniele Bartolini 5 лет назад
Родитель
Сommit
f98f468d32

+ 10 - 9
tools/level_editor/level_editor.vala

@@ -447,6 +447,15 @@ namespace Crown
 			{
 				LevelEditorWindow win = new LevelEditorWindow(this);
 				win.add(_main_vbox);
+
+				try
+				{
+					win.icon = IconTheme.get_default().load_icon("pepper", 48, 0);
+				}
+				catch (Error e)
+				{
+					_console_view.loge("editor", e.message);
+				}
 			}
 
 			this.active_window.show_all();
@@ -1637,15 +1646,7 @@ namespace Crown
 			dlg.set_destroy_with_parent(true);
 			dlg.set_transient_for(this.active_window);
 			dlg.set_modal(true);
-
-			try
-			{
-				dlg.set_logo(new Pixbuf.from_resource("/org/crown/level_editor/icons/128x128/pepper.png"));
-			}
-			catch (Error e)
-			{
-				_console_view.loge("editor", e.message);
-			}
+			dlg.set_logo_icon_name("pepper");
 
 			dlg.program_name = "Crown Game Engine";
 			dlg.version = CROWN_VERSION;

Разница между файлами не показана из-за своего большого размера
+ 2837 - 3579
tools/level_editor/resources/gresources.c


+ 6 - 6
tools/level_editor/resources/gresources.xml

@@ -6,7 +6,7 @@
 		<file compressed="true" preprocess="xml-stripblanks">ui/toolbar.ui</file>
 		<file compressed="true">css/style.css</file>
 
-		<file>icons/128x128/pepper.png</file>
+		<file>icons/128x128/apps/pepper.png</file>
 
 		<file>icons/16x16/actions/axis-local.png</file>
 		<file>icons/16x16/actions/axis-world.png</file>
@@ -23,15 +23,15 @@
 		<file>icons/16x16/actions/tool-place.png</file>
 		<file>icons/16x16/actions/tool-rotate.png</file>
 		<file>icons/16x16/actions/tool-scale.png</file>
-		<file>icons/16x16/pepper.png</file>
+		<file>icons/16x16/apps/pepper.png</file>
 
-		<file>icons/24x24/pepper.png</file>
+		<file>icons/24x24/apps/pepper.png</file>
 
-		<file>icons/256x256/pepper.png</file>
+		<file>icons/256x256/apps/pepper.png</file>
 
-		<file>icons/32x32/pepper.png</file>
+		<file>icons/32x32/apps/pepper.png</file>
 
-		<file>icons/64x64/pepper.png</file>
+		<file>icons/64x64/apps/pepper.png</file>
 
 	</gresource>
 </gresources>

+ 0 - 0
tools/level_editor/resources/icons/128x128/pepper.png → tools/level_editor/resources/icons/128x128/apps/pepper.png


+ 0 - 0
tools/level_editor/resources/icons/16x16/pepper.png → tools/level_editor/resources/icons/16x16/apps/pepper.png


+ 0 - 0
tools/level_editor/resources/icons/24x24/pepper.png → tools/level_editor/resources/icons/24x24/apps/pepper.png


+ 0 - 0
tools/level_editor/resources/icons/256x256/pepper.png → tools/level_editor/resources/icons/256x256/apps/pepper.png


+ 0 - 0
tools/level_editor/resources/icons/32x32/pepper.png → tools/level_editor/resources/icons/32x32/apps/pepper.png


+ 0 - 0
tools/level_editor/resources/icons/64x64/pepper.png → tools/level_editor/resources/icons/64x64/apps/pepper.png


Некоторые файлы не были показаны из-за большого количества измененных файлов