mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-12-28 15:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

As now the window can be resized in all platforms we can remove "Configure Screen" option.

Browse Source
This commit is contained in:
David Capello 2010-11-04 21:47:54 -03:00
parent 0139524c15
commit 742cf18237
5 changed files with 2 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
data/gui.xml
View File

@ -309,12 +309,8 @@
</item> </item>
<item command="preview" text="Previe&amp;w" /> <item command="preview" text="Previe&amp;w" />
<separator /> <separator />
<menu text="Scree&amp;n"> <item command="refresh" text="&amp;Refresh &amp;&amp; Reload Skin" />
<item command="configure_screen" text="&amp;Configure Screen" /> <item command="screen_shot" text="&amp;Screen Shot" />
<separator />
<item command="refresh" text="&amp;Refresh &amp;&amp; Reload Skin" />
<item command="screen_shot" text="&amp;Screen Shot" />
</menu>
</menu> </menu>
<menu text="&amp;Help"> <menu text="&amp;Help">
<item command="quick_reference" text="Quick &amp;Reference" /> <item command="quick_reference" text="Quick &amp;Reference" />
@ -357,37 +353,6 @@
<item command="copy_cel" text="&amp;Copy" /> <item command="copy_cel" text="&amp;Copy" />
</menu> </menu>
</menus> </menus>
<!-- resolutions -->
<resolutions>
<screensize width="320" height="200" aspect="16:10" />
<screensize width="320" height="240" aspect="4:3" />
<screensize width="640" height="400" aspect="16:10" />
<screensize width="640" height="480" aspect="4:3" />
<screensize width="800" height="600" aspect="4:3" />
<screensize width="1024" height="768" aspect="4:3" />
<screensize width="1280" height="720" aspect="16:9" />
<screensize width="1280" height="768" aspect="-" />
<screensize width="1280" height="800" aspect="16:10" />
<screensize width="1360" height="768" aspect="-" />
<screensize width="1600" height="900" aspect="16:9" />
<screensize width="1600" height="1200" aspect="4:3" />
<screensize width="1680" height="1050" aspect="16:10" />
<screensize width="1920" height="1200" aspect="16:10" />
<screensize width="2560" height="1600" aspect="16:10" />
<colordepth bpp="15" label="15 bpp (32K colors)" />
<colordepth bpp="16" label="16 bpp (64K colors)" />
<colordepth bpp="24" label="24 bpp (16M colors)" />
<colordepth bpp="32" label="32 bpp (16M colors)" />
<pixelscale factor="1" label="x1 (normal)" />
<pixelscale factor="2" label="x2 (double)" />
<pixelscale factor="3" label="x3 (big)" />
<pixelscale factor="4" label="x4 (huge)" />
</resolutions>
<!-- tools --> <!-- tools -->
<tools> <tools>

26
data/widgets/configure_screen.xml
View File

@ -1,26 +0,0 @@
<!-- ASE - Allegro Sprite Editor -->
<!-- Copyright (C) 2001-2010 by David Capello -->
<jinete>
<window text="Configure Screen" name="configure_screen">
<box vertical="true">
<box horizontal="true" expansive="true">
<box vertical="true" homogeneous="true">
<label text="Resolution:" />
<label text="Color depth:" />
<label text="Pixel scaling:" />
<check text="Fullscreen" name="fullscreen" />
</box>
<box vertical="true" homogeneous="true" expansive="true">
<combobox name="resolution" />
<combobox name="color_depth" />
<combobox name="pixel_scale" />
<label text="" />
</box>
</box>
<box horizontal="true" homogeneous="true">
<button text="&amp;OK" closewindow="true" name="ok" magnetic="true" />
<button text="&amp;Cancel" closewindow="true" />
</box>
</box>
</window>
</jinete>

1
src/CMakeLists.txt
View File

@ -95,7 +95,6 @@ add_library(aseprite-library
commands/cmd_check_updates.cpp commands/cmd_check_updates.cpp
commands/cmd_clear.cpp commands/cmd_clear.cpp
commands/cmd_close_file.cpp commands/cmd_close_file.cpp
commands/cmd_configure_screen.cpp
commands/cmd_configure_tools.cpp commands/cmd_configure_tools.cpp
commands/cmd_copy.cpp commands/cmd_copy.cpp
commands/cmd_copy_cel.cpp commands/cmd_copy_cel.cpp

229
src/commands/cmd_configure_screen.cpp
View File

@ -1,229 +0,0 @@
/* ASE - Allegro Sprite Editor
* Copyright (C) 2001-2010 David Capello
*
* 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.
*
* 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
*/
#include "config.h"
#include <allegro.h>
#include <utility>
#include <vector>
#include "gui/jinete.h"
#include "app.h"
#include "commands/command.h"
#include "console.h"
#include "gfxmode.h"
#include "gui_xml.h"
#include "modules/gui.h"
#include "modules/palettes.h"
#include "sprite_wrappers.h"
static int timer_to_accept;
static int seconds_to_accept;
static bool alert_msg_proc(JWidget widget, JMessage msg);
//////////////////////////////////////////////////////////////////////
class ConfigureScreen : public Command
{
public:
ConfigureScreen();
Command* clone() const { return new ConfigureScreen(*this); }
protected:
void onExecute(Context* context);
private:
void load_resolutions(ComboBox* resolution, ComboBox* color_depth, ComboBox* pixel_scale);
GfxMode m_newMode;
std::vector<std::pair<int, int> > m_resolutions;
std::vector<int> m_colordepths;
std::vector<int> m_pixelscale;
};
ConfigureScreen::ConfigureScreen()
: Command("configure_screen",
"Configure Screen",
CmdUIOnlyFlag)
{
}
void ConfigureScreen::onExecute(Context* context)
{
CurrentGfxModeGuard currentGfxModeGuard;
m_newMode = currentGfxModeGuard.getOriginal(); // Default values
ComboBox* resolution, *color_depth, *pixel_scale;
Widget* fullscreen;
FramePtr window(load_widget("configure_screen.xml", "configure_screen"));
get_widgets(window,
"resolution", &resolution,
"color_depth", &color_depth,
"pixel_scale", &pixel_scale,
"fullscreen", &fullscreen, NULL);
load_resolutions(resolution, color_depth, pixel_scale);
fullscreen->setSelected(!is_windowed_mode());
window->open_window_fg();
if (window->get_killer() == jwidget_find_name(window, "ok")) {
m_newMode.setWidth(m_resolutions[resolution->getSelectedItem()].first);
m_newMode.setHeight(m_resolutions[resolution->getSelectedItem()].second);
m_newMode.setDepth(m_colordepths[color_depth->getSelectedItem()]);
m_newMode.setScaling(m_pixelscale[pixel_scale->getSelectedItem()]);
m_newMode.setCard(fullscreen->isSelected() ? GFX_AUTODETECT_FULLSCREEN:
GFX_AUTODETECT_WINDOWED);
// Setup graphics mode
if (currentGfxModeGuard.tryGfxMode(m_newMode)) {
FramePtr alert_window(jalert_new("Confirm Screen"
"<<Do you want to keep this screen resolution?"
"<<In 10 seconds the screen will be restored."
"||&Yes||&No"));
jwidget_add_hook(alert_window, -1, alert_msg_proc, NULL);
seconds_to_accept = 10;
timer_to_accept = jmanager_add_timer(alert_window, 1000);
jmanager_start_timer(timer_to_accept);
alert_window->open_window_fg();
jmanager_remove_timer(timer_to_accept);
if (alert_window->get_killer() != NULL &&
ustrcmp(alert_window->get_killer()->getName(), "button-1") == 0) {
// Keep the current graphics mode
currentGfxModeGuard.keep();
}
}
}
// "currentGfxModeGuard" destruction keeps the new graphics mode or restores the old one
}
void ConfigureScreen::load_resolutions(ComboBox* resolution, ComboBox* color_depth, ComboBox* pixel_scale)
{
char buf[512];
bool old_res_selected = false;
int newItem;
m_resolutions.clear();
m_colordepths.clear();
m_pixelscale.clear();
TiXmlDocument& doc(GuiXml::instance()->doc());
TiXmlHandle handle(&doc);
TiXmlElement* xmlElement = handle
.FirstChild("gui")
.FirstChild("resolutions")
.FirstChildElement().ToElement();
while (xmlElement) {
if (strcmp(xmlElement->Value(), "screensize") == 0) {
int w = ustrtol(xmlElement->Attribute("width"), NULL, 10);
int h = ustrtol(xmlElement->Attribute("height"), NULL, 10);
const char* aspect = xmlElement->Attribute("aspect");
if (w > 0 && h > 0) {
m_resolutions.push_back(std::make_pair(w, h));
if (aspect)
sprintf(buf, "%dx%d (%s)", w, h, aspect);
else
sprintf(buf, "%dx%d", w, h);
newItem = resolution->addItem(buf);
if (m_newMode.getWidth() == w && m_newMode.getHeight() == h) {
old_res_selected = true;
resolution->setSelectedItem(newItem);
}
}
}
else if (strcmp(xmlElement->Value(), "colordepth") == 0) {
int bpp = ustrtol(xmlElement->Attribute("bpp"), NULL, 10);
const char* label = xmlElement->Attribute("label");
if (bpp > 0 && label) {
m_colordepths.push_back(bpp);
newItem = color_depth->addItem(label);
if (m_newMode.getDepth() == bpp)
color_depth->setSelectedItem(newItem);
}
}
else if (strcmp(xmlElement->Value(), "pixelscale") == 0) {
int factor = ustrtol(xmlElement->Attribute("factor"), NULL, 10);
const char* label = xmlElement->Attribute("label");
if (factor > 0 && label) {
m_pixelscale.push_back(factor);
newItem = pixel_scale->addItem(label);
if (m_newMode.getScaling() == factor)
pixel_scale->setSelectedItem(newItem);
}
}
xmlElement = xmlElement->NextSiblingElement();
}
// Current screen size
if (!old_res_selected) {
m_resolutions.insert(m_resolutions.begin(), std::make_pair(m_newMode.getWidth(), m_newMode.getHeight()));
sprintf(buf, "%dx%d (Current)", m_resolutions[0].first, m_resolutions[0].second);
resolution->insertItem(0, buf);
resolution->setSelectedItem(0);
}
}
static bool alert_msg_proc(JWidget widget, JMessage msg)
{
if (msg->type == JM_TIMER) {
if (msg->timer.timer_id == timer_to_accept) {
JList labels = jwidget_get_children(jwidget_find_name(widget, "labels"));
char buf[512];
seconds_to_accept -= msg->timer.count;
seconds_to_accept = MAX(0, seconds_to_accept);
usprintf(buf, "In %d seconds the screen will be restored.", seconds_to_accept);
((JWidget)labels->end->next->next->data)->setText(buf);
jlist_free(labels);
if (seconds_to_accept == 0) {
jmanager_stop_timer(timer_to_accept);
static_cast<Frame*>(widget)->closeWindow(NULL);
return true;
}
}
}
return false;
}
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_configure_screen_command()
{
return new ConfigureScreen;
}

1
src/commands/commands_list.h
View File

@ -31,7 +31,6 @@ FOR_EACH_COMMAND(close_all_files)
FOR_EACH_COMMAND(close_editor) FOR_EACH_COMMAND(close_editor)
FOR_EACH_COMMAND(close_file) FOR_EACH_COMMAND(close_file)
FOR_EACH_COMMAND(color_curve) FOR_EACH_COMMAND(color_curve)
FOR_EACH_COMMAND(configure_screen)
FOR_EACH_COMMAND(configure_tools) FOR_EACH_COMMAND(configure_tools)
FOR_EACH_COMMAND(convolution_matrix) FOR_EACH_COMMAND(convolution_matrix)
FOR_EACH_COMMAND(copy) FOR_EACH_COMMAND(copy)