pts-core: Move images to pts-core/static/images/

CHANGE-LOG

@@ -12,6 +12,7 @@ Phoronix Test Suite (Git)
 - pts-core: Allow test options to be specified externally via PRESET_OPTIONS environmental variable (see commit for example)
 - pts-core: Fix bug where from GTK2 GUI selecting to not save test results would prompt you from CLI to save results or not
 - pts-core: Vastly re-work the pts-includes-run_options code
+- pts-core: Move images to pts-core/static/images/
 - phodevi: Fix possible space when getting resolutions from xrandr
 - pts: Add workstation test suite
 - pts: Add disk-ssd test suite

install-sh

@@ -66,7 +66,7 @@ rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/man-pages/
 
 cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX/share/man/man1/
 cp pts-core/static/bash_completion $DESTDIR$INSTALL_PREFIX/../etc/bash_completion.d/phoronix-test-suite
-cp pts-core/static/phoronix-test-suite.png $DESTDIR$INSTALL_PREFIX/share/icons/phoronix-test-suite.png
+cp pts-core/static/images/phoronix-test-suite.png $DESTDIR$INSTALL_PREFIX/share/icons/phoronix-test-suite.png
 cp pts-core/static/phoronix-test-suite.desktop $DESTDIR$INSTALL_PREFIX/share/applications/
 
 cp -r pts/ $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/

pts-core/library/pts-functions_config.php

@@ -78,7 +78,7 @@ function pts_user_config_init($new_config_values = null)
 
 	pts_mkdir(PTS_USER_DIR . "xsl/");
 	pts_copy(STATIC_DIR . "pts-user-config-viewer.xsl", PTS_USER_DIR . "xsl/" . "pts-user-config-viewer.xsl");
-	pts_copy(STATIC_DIR . "pts-308x160.png", PTS_USER_DIR . "xsl/" . "pts-logo.png");
+	pts_copy(STATIC_DIR . "images/pts-308x160.png", PTS_USER_DIR . "xsl/" . "pts-logo.png");
 }
 function pts_module_config_init($SetOptions = null)
 {

pts-core/objects/gtk/pts_gtk_advanced_progress_window.php

@@ -31,7 +31,7 @@ class pts_gtk_advanced_progress_window extends pts_gtk_simple_progress_window
 		parent::__construct($title);
 		$this->set_size_request(500, 380);
 
-		$logo = GtkImage::new_from_file(STATIC_DIR . "pts-308x160-t.png");
+		$logo = GtkImage::new_from_file(STATIC_DIR . "images/pts-308x160-t.png");
 		$logo->set_size_request(308, 160);
 
 		$this->loading_label = new pts_gtk_label(null);

pts-core/objects/gtk/pts_gtk_simple_progress_window.php

@@ -28,7 +28,7 @@ class pts_gtk_simple_progress_window extends GtkDialog
 	public function __construct($title = null)
 	{
 		parent::__construct(($title == null ? "Phoronix Test Suite v" . PTS_VERSION : $title), null, Gtk::DIALOG_MODAL);
-		$this->set_icon(GdkPixbuf::new_from_file(STATIC_DIR . "pts-icon.png"));
+		$this->set_icon(GdkPixbuf::new_from_file(STATIC_DIR . "images/pts-icon.png"));
 
 		$this->loading_label = new pts_gtk_label("Loading...");
 		$this->gtk_progress_bar = new pts_gtk_progress_bar();
@@ -40,7 +40,7 @@ class pts_gtk_simple_progress_window extends GtkDialog
 
 		$this->set_size_request(360, 270);
 
-		$logo = GtkImage::new_from_file(STATIC_DIR . "pts-308x160-t.png");
+		$logo = GtkImage::new_from_file(STATIC_DIR . "images/pts-308x160-t.png");
 		$logo->set_size_request(308, 160);
 
 		pts_gtk_array_to_boxes($this->vbox, array(null, $logo, null, $this->gtk_progress_bar, $this->loading_label), 2, true);

pts-core/objects/gtk/pts_gtk_window.php

@@ -30,7 +30,7 @@ class pts_gtk_window extends GtkWindow
 		$this->set_title($window_title);
 		$this->set_size_request($window_width, $window_height);
 
-		$this->set_icon(GdkPixbuf::new_from_file(STATIC_DIR . "pts-icon.png"));
+		$this->set_icon(GdkPixbuf::new_from_file(STATIC_DIR . "images/pts-icon.png"));
 	}
 }
 

pts-core/options/gui_gtk.php

@@ -54,7 +54,7 @@ class gui_gtk implements pts_option_interface
 		if($system_tray == null)
 		{
 			$system_tray = new GtkStatusIcon();
-			$system_tray->set_from_file(STATIC_DIR . "pts-icon.png");
+			$system_tray->set_from_file(STATIC_DIR . "images/pts-icon.png");
 			$system_tray->set_tooltip("Phoronix Test Suite v" . PTS_VERSION);
 			$system_tray->connect("activate", array("gui_gtk", "system_tray_activate"));
 			$system_tray->connect("popup-menu", array("gui_gtk", "system_tray_menu"));

pts-core/options/result_file_to_pdf.php

@@ -49,7 +49,7 @@ class result_file_to_pdf implements pts_option_interface
 		$pdf = new pts_pdf_template($xml_parser->getXMLValue(P_RESULTS_SUITE_TITLE), $xml_parser->getXMLValue(P_RESULTS_SUITE_NAME));
 
 		$pdf->AddPage();
-		$pdf->Image(STATIC_DIR . "pts-308x160.png", 69, 85, 73, 38);
+		$pdf->Image(STATIC_DIR . "images/pts-308x160.png", 69, 85, 73, 38);
 		$pdf->Ln(120);
 		$pdf->WriteStatementCenter("www.phoronix-test-suite.com");
 		$pdf->Ln(15);

pts-core/options/result_file_to_ps.php

@@ -53,7 +53,7 @@ class result_file_to_ps implements pts_option_interface
 		//ps_set_info("Subject", "Phoronix Test Suite");
 
 		ps_begin_page($ps, $page_width, $page_height);
-		$pdf->Image(STATIC_DIR . "pts-308x160.png", 69, 85, 73, 38);
+		$pdf->Image(STATIC_DIR . "images/pts-308x160.png", 69, 85, 73, 38);
 		$pdf->Ln(120);
 		$pdf->WriteStatementCenter("www.phoronix-test-suite.com");
 		$pdf->Ln(15);

pts-core/static/error-gui.html

@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 	</head>
 	<body>
 		<div style="width: 90%; margin: 20px auto 10px; text-align: left;">
-			<p align="center"><img src="pts-308x160.png" /><br />&nbsp;</p>
+			<p align="center"><img src="images/pts-308x160.png" /><br />&nbsp;</p>
 			<p>The graphical user interface for the Phoronix Test Suite failed to load. This is generally caused when the <a href="http://gtk.php.net/">PHP GTK</a> module is missing. Make sure that you have PHP GTK installed before proceeding or use the command-line version of the phoronix-test-suite. For more information, read the included Phoronix Test Suite documentation or visit <a href="http://www.phoronix-test-suite.com/">Phoronix-Test-Suite.com</a>. For technical support, visit the <a href="http://www.phoronix.com/forums/forumdisplay.php?f=49">Phoronix Forums</a>.</p>
 		</div>
 		<div style="text-align: center; font-size: 12px;">Copyright &copy; 2008 - 2009 by <a href="http://www.phoronix-media.com/" style="text-decoration: none; color: #000;">Phoronix Media</a>.</div>