r7384 chris_y - in /trunk/netsurf: !NetSurf/Resources/de/Messages !NetSurf/Resources/en/Messages !NetSurf/Resources/fr/Messages !NetSurf/Resources/it/Messages !NetSurf/Resources/nl/Messages amiga/download.c amiga/download.h amiga/gui.c
by netsurf＠semichrome.net
Author: chris_y
Date: Thu Apr 30 13:40:26 2009
New Revision: 7384
URL: http://source.netsurf-browser.org?rev=7384&view=rev
Log:
Add Abort button to download window
Modified:
trunk/netsurf/!NetSurf/Resources/de/Messages
trunk/netsurf/!NetSurf/Resources/en/Messages
trunk/netsurf/!NetSurf/Resources/fr/Messages
trunk/netsurf/!NetSurf/Resources/it/Messages
trunk/netsurf/!NetSurf/Resources/nl/Messages
trunk/netsurf/amiga/download.c
trunk/netsurf/amiga/download.h
trunk/netsurf/amiga/gui.c
Modified: trunk/netsurf/!NetSurf/Resources/de/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/de/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/de/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/de/Messages Thu Apr 30 13:40:26 2009
@@ -373,6 +373,7 @@
DownloadU:%s von unbekannt ⢠%s/s ⢠bisher %s
Downloaded:%s komplett ⢠etwa %s/s ⢠gesamt %s
Unwritten:Schreiben der Datei ist fehlgeschlagen.
+Abort:Abort
# Amiga download window tokens
#
Modified: trunk/netsurf/!NetSurf/Resources/en/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/en/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/en/Messages Thu Apr 30 13:40:26 2009
@@ -373,6 +373,7 @@
DownloadU:%s of unknown ⢠%s/s ⢠%s total
Downloaded:%s complete ⢠average %s/s ⢠%s total
Unwritten:Writing data to file failed.
+Abort:Abort
# Amiga download window tokens
#
Modified: trunk/netsurf/!NetSurf/Resources/fr/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/fr/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/fr/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/fr/Messages Thu Apr 30 13:40:26 2009
@@ -373,6 +373,7 @@
DownloadU:%s sur inconnu ⢠%s/s ⢠%s total
Downloaded:%s effectués ⢠moyenne %s/s ⢠%s total
Unwritten:L'écriture de données dans le fichier a échoué.
+Abort:Abort
# Amiga download window tokens
#
Modified: trunk/netsurf/!NetSurf/Resources/it/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/it/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/it/Messages Thu Apr 30 13:40:26 2009
@@ -374,6 +374,7 @@
DownloadU:%s sconosciuto ? %s/s ? %s totale
Downloaded:%s completato ? media %s/s ? %s totale
Unwritten:Scrittura dei dati sul file fallita.
+Abort:Abort
# Amiga download window tokens
#
Modified: trunk/netsurf/!NetSurf/Resources/nl/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/nl/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/nl/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/nl/Messages Thu Apr 30 13:40:26 2009
@@ -373,6 +373,7 @@
DownloadU:%s van onbekend ⢠%s/s ⢠%s totaal
Downloaded:%s compleet ⢠gemiddeld %s/s ⢠%s totaal
Unwritten:Data naar bestand schrijven ging fout.
+Abort:Abort
# Amiga download window tokens
#
Modified: trunk/netsurf/amiga/download.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.c?rev=7384...
==============================================================================
--- trunk/netsurf/amiga/download.c (original)
+++ trunk/netsurf/amiga/download.c Thu Apr 30 13:40:26 2009
@@ -31,6 +31,8 @@
#include "amiga/options.h"
#include "amiga/save_complete.h"
+#include "content/fetch.h"
+
#include "desktop/selection.h"
#include "utils/messages.h"
@@ -103,6 +105,8 @@
WA_CloseGadget, FALSE,
WA_SizeGadget, TRUE,
WA_CustomScreen,scrn,
+ WINDOW_SharedPort,sport,
+ WINDOW_UserData,dw,
WINDOW_IconifyGadget, TRUE,
WINDOW_LockHeight,TRUE,
WINDOW_Position, WPOS_CENTERSCREEN,
@@ -118,13 +122,20 @@
FUELGAUGE_VarArgs,va,
FUELGAUGE_Percent,FALSE,
FUELGAUGE_Justification,FGJ_CENTER,
- StringEnd,
+ FuelGaugeEnd,
CHILD_NominalSize,TRUE,
CHILD_WeightedHeight,0,
+ LAYOUT_AddChild, dw->gadgets[GID_CANCEL] = ButtonObject,
+ GA_ID,GID_CANCEL,
+ GA_RelVerify,TRUE,
+ GA_Text,messages_get("Abort"),
+ GA_TabCycle,TRUE,
+ ButtonEnd,
EndGroup,
EndWindow;
dw->win = (struct Window *)RA_OpenWindow(dw->objects[OID_MAIN]);
+ dw->fetch = fetch;
dw->node = AddObject(window_list,AMINS_DLWINDOW);
dw->node->objstruct = dw;
@@ -167,6 +178,12 @@
const char *error_msg)
{
warn_user("Unwritten","");
+ gui_download_window_done(dw);
+}
+
+void ami_download_window_abort(struct gui_download_window *dw)
+{
+ fetch_abort(dw->fetch);
gui_download_window_done(dw);
}
Modified: trunk/netsurf/amiga/download.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.h?rev=7384...
==============================================================================
--- trunk/netsurf/amiga/download.h (original)
+++ trunk/netsurf/amiga/download.h Thu Apr 30 13:40:26 2009
@@ -37,11 +37,13 @@
uint32 downloaded;
struct dlnode *dln;
struct browser_window *bw;
+ struct fetch *fetch;
};
int drag_save;
void *drag_save_data;
+void ami_download_window_abort(struct gui_download_window *dw);
void ami_drag_save(struct Window *win);
void ami_free_download_list(struct List *dllist);
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=7384&r1=7...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Thu Apr 30 13:40:26 2009
@@ -945,6 +945,11 @@
if(gwin->node->Type == AMINS_LOGINWINDOW)
{
ami_401login_close((struct gui_login_window *)gwin);
+ win_destroyed = true;
+ }
+ else if(gwin->node->Type == AMINS_DLWINDOW)
+ {
+ ami_download_window_abort((struct gui_download_window *)gwin);
win_destroyed = true;
}
break;
14 years, 4 months
r7383 MarkieB - in /branches/MarkieB/search: ./ gtk/dialogs/gtk_options.c gtk/gtk_scaffolding.c
by netsurf＠semichrome.net
Author: MarkieB
Date: Thu Apr 30 10:42:16 2009
New Revision: 7383
URL: http://source.netsurf-browser.org?rev=7383&view=rev
Log:
style adjustments to gui; standardisation of search ico size, increasing default window width
Modified:
branches/MarkieB/search/ (props changed)
branches/MarkieB/search/gtk/dialogs/gtk_options.c
branches/MarkieB/search/gtk/gtk_scaffolding.c
Propchange: branches/MarkieB/search/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 30 10:42:16 2009
@@ -1,1 +1,1 @@
-/branches/dynis/netsurf:1-4310,4345-4486 /branches/adamblokus/netsurf:1-5155 /branches/takkaria/netsurf-hubbub:1-5018 /branches/mikeL/netsurf:1-4272,4275-4285,4287-5188 /branches/vince/netsurf-fb:1-5422 /trunk/netsurf:1-7292
+/branches/adamblokus/netsurf:1-5155 /branches/dynis/netsurf:1-4310,4345-4486 /branches/mikeL/netsurf:1-4272,4275-4285,4287-5188 /branches/takkaria/netsurf-hubbub:1-5018 /branches/vince/netsurf-fb:1-5422
Modified: branches/MarkieB/search/gtk/dialogs/gtk_options.c
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/dialogs/gtk...
==============================================================================
--- branches/MarkieB/search/gtk/dialogs/gtk_options.c (original)
+++ branches/MarkieB/search/gtk/dialogs/gtk_options.c Thu Apr 30 10:42:16 2009
@@ -710,6 +710,7 @@
struct gui_window *current;
GtkImage *searchico;
+ GdkPixbuf *pbico;
char *iconame;
gchar *icofile;
@@ -729,7 +730,9 @@
current->scaffold->webSearchIcoHolder),
GTK_WIDGET(searchico));
- searchico = GTK_IMAGE(gtk_image_new_from_file(icofile));
+ pbico = GDK_PIXBUF(gdk_pixbuf_new_from_file_at_size(icofile, 20, 20,
+ NULL));
+ searchico = GTK_IMAGE(gtk_image_new_from_pixbuf(pbico));
gtk_container_add(GTK_CONTAINER(
current->scaffold->webSearchIcoHolder),
Modified: branches/MarkieB/search/gtk/gtk_scaffolding.c
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/gtk_scaffol...
==============================================================================
--- branches/MarkieB/search/gtk/gtk_scaffolding.c (original)
+++ branches/MarkieB/search/gtk/gtk_scaffolding.c Thu Apr 30 10:42:16 2009
@@ -1232,6 +1232,7 @@
struct gtk_scaffolding *g = malloc(sizeof(*g));
char *iconame;
gchar *icofile;
+ GdkPixbuf *pbico;
GtkImage *searchico;
LOG(("Constructing a scaffold of %p for gui_window %p", g, toplevel));
@@ -1289,7 +1290,7 @@
gtk_window_resize(g->window, option_window_width,
option_window_height);
} else {
- gtk_window_set_default_size(g->window, 600, 600);
+ gtk_window_set_default_size(g->window, 700, 600);
}
/* Default toolbar button type uses system defaults */
@@ -1425,8 +1426,9 @@
NULL);
free(iconame);
LOG(("retrieving ico %s\n", icofile));
- searchico = GTK_IMAGE(gtk_image_new_from_file(icofile));
-
+ pbico = GDK_PIXBUF(gdk_pixbuf_new_from_file_at_size(icofile, 20, 20,
+ NULL));
+ searchico = GTK_IMAGE(gtk_image_new_from_pixbuf(pbico));
g_free(icofile);
/* add ico to toolbar */
14 years, 4 months
r7382 tlsa - /trunk/netsurfweb/documentation/progress.en
by netsurf＠semichrome.net
Author: tlsa
Date: Thu Apr 30 09:15:00 2009
New Revision: 7382
URL: http://source.netsurf-browser.org?rev=7382&view=rev
Log:
Update status of some features. The NetSurf features bit needs restructured for multi-platform info.
Modified:
trunk/netsurfweb/documentation/progress.en
Modified: trunk/netsurfweb/documentation/progress.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/documentation/progress...
==============================================================================
--- trunk/netsurfweb/documentation/progress.en (original)
+++ trunk/netsurfweb/documentation/progress.en Thu Apr 30 09:15:00 2009
@@ -67,7 +67,7 @@
<li><a href="#NSF">NetSurf features</a></li>
</ul>
-<p class="updated">Last updated 16 October 2008</p>
+<p class="updated">Last updated 30 April 2009</p>
<h2 id="General"></h2>
@@ -250,7 +250,7 @@
<tr class="complete"><td>Downloads (RISC OS)</td><td>Complete</td><td>Following a link to a file NetSurf can't render opens the download dialogue box.</td></tr>
<tr class="complete"><td>Downloads (GTK)</td><td>Complete</td><td></td></tr>
<tr class="nearlydone"><td>Find Text (RISC OS)</td><td>Nearly done</td><td>Doesn't find phrases if they are split across lines.</td></tr>
-<tr class="notstarted"><td>Find Text (GTK)</td><td>Not started</td><td></td></tr>
+<tr class="juststarted"><td>Find Text (GTK)</td><td>Just started</td><td></td></tr>
<tr class="nearlydone"><td>Full Save (RISC OS)</td><td>Nearly done</td><td>Save pages with CSS files and images.<br>Doesn't rewrite URLs for CSS background images.</td></tr>
<tr class="notstarted"><td>Full Save (GTK)</td><td>Not started</td><td></td></tr>
<tr class="nearlydone"><td>History - Global (RISC OS)</td><td>Nearly done</td><td>Details in the <a href="guide#History">User Guide</a>.</td></tr>
@@ -262,8 +262,8 @@
<tr class="nearlydone"><td>Interactive Help (RISC OS)</td><td>Nearly done</td><td></td></tr>
<tr class="nearlydone"><td>Interactive Help (GTK)</td><td>Nearly done</td><td>Extensive tool tips for GUI but none for rendering area.</td></tr>
<tr class="complete"><td>Memory Cache</td><td>Complete</td><td></td></tr>
-<tr class="inprogress"><td>Printing (RISC OS)</td><td>In progress</td><td>Printing on RISC OS 5 doesn't work, due to lack of support in the Font Manager and printer drivers. Details on the <a href="roinfo#Unicode">RISC OS User Information</a> page.</td></tr>
-<tr class="notstarted"><td>Printing (GTK)</td><td>Not started</td><td>Started to think about it. Needs Cairo backend updating.</td></tr>
+<tr class="complete"><td>Printing (RISC OS)</td><td>Complete</td><td>Printing on RISC OS 5 doesn't work, due to lack of support in the Font Manager and printer drivers. Details on the <a href="roinfo#Unicode">RISC OS User Information</a> page.</td></tr>
+<tr class="complete"><td>Printing (GTK)</td><td>Complete</td><td></td></tr>
<tr class="inprogress"><td>Proxy Support</td><td>In progress</td><td>Protocols other than HTTP are incorrectly proxied.</td></tr>
<tr class="nearlydone"><td>Save as Drawfile (RISC OS)</td><td>Nearly done</td><td>Embedded drawfiles aren't exported when saving page as Draw. (Draw is a RISC OS vector graphics format.)</td></tr>
<tr class="inprogress"><td>Save as Text (RISC OS)</td><td>In progress</td><td>Some issues with spacing out of text.</td></tr>
@@ -278,7 +278,7 @@
<tr class="complete"><td>Unicode Font Support (GTK)</td><td>Complete</td><td></td></tr>
<tr class="complete"><td>URL Completion</td><td>Complete</td><td>When typing a URL into the URL bar, NetSurf will display suggestions for the full address.</td></tr>
<tr class="complete"><td>View Source (RISC OS)</td><td>Complete</td><td>Press F8 or <i>Page > View source</i> on main menu.</td></tr>
-<tr class="notstarted"><td>View Source (GTK)</td><td>Not started</td><td></td></tr>
+<tr class="complete"><td>View Source (GTK)</td><td>Complete</td><td></td></tr>
</table>
14 years, 4 months
r7381 tlsa - /trunk/netsurfweb/projects/libparserutils/index.en
by netsurf＠semichrome.net
Author: tlsa
Date: Thu Apr 30 08:36:06 2009
New Revision: 7381
URL: http://source.netsurf-browser.org?rev=7381&view=rev
Log:
Spelling.
Modified:
trunk/netsurfweb/projects/libparserutils/index.en
Modified: trunk/netsurfweb/projects/libparserutils/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/projects/libparserutil...
==============================================================================
--- trunk/netsurfweb/projects/libparserutils/index.en (original)
+++ trunk/netsurfweb/projects/libparserutils/index.en Thu Apr 30 08:36:06 2009
@@ -34,8 +34,8 @@
<h2>Features</h2>
<ul>
-<li>No manditory dependencies (<code>iconv()</code> implmentation optional for enhanced charset support)</li>
-<li>A number of built-in character set convertors</li>
+<li>No mandatory dependencies (<code>iconv()</code> implementation optional for enhanced charset support)</li>
+<li>A number of built-in character set converters</li>
<li>Mapping of character set names to/from MIB enum values</li>
<li>UTF-8 and UTF-16 (host endian) support functions</li>
<li>Various simple data structures (resizeable buffer, stack, vector)</li>
14 years, 4 months
r7380 tlsa - in /trunk/netsurfweb/projects: hubbub/index.en libnsbmp/index.en libnsgif/index.en libparserutils/index.en
by netsurf＠semichrome.net
Author: tlsa
Date: Thu Apr 30 08:33:01 2009
New Revision: 7380
URL: http://source.netsurf-browser.org?rev=7380&view=rev
Log:
Add links to libarary release tarballs.
Modified:
trunk/netsurfweb/projects/hubbub/index.en
trunk/netsurfweb/projects/libnsbmp/index.en
trunk/netsurfweb/projects/libnsgif/index.en
trunk/netsurfweb/projects/libparserutils/index.en
Modified: trunk/netsurfweb/projects/hubbub/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/projects/hubbub/index....
==============================================================================
--- trunk/netsurfweb/projects/hubbub/index.en (original)
+++ trunk/netsurfweb/projects/hubbub/index.en Thu Apr 30 08:33:01 2009
@@ -62,6 +62,12 @@
<p>Hubbub is licensed under the <a href="http://opensource.org/licenses/mit-license.php">MIT Licence</a>.</p>
+<h2>Releases</h2>
+
+<ul>
+<li><a href="../releases/hubbub-0.0.1-src.tar.gz">Hubbub 0.0.1 tarball</a></li>
+</ul>
+
<h2>Contact</h2>
<p>If you would like to help develop Hubbub, or have questions about the library, please join the NetSurf <a href="http://www.netsurf-browser.org/lists/netsurf-dev">developer mailing list</a>.</p>
Modified: trunk/netsurfweb/projects/libnsbmp/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/projects/libnsbmp/inde...
==============================================================================
--- trunk/netsurfweb/projects/libnsbmp/index.en (original)
+++ trunk/netsurfweb/projects/libnsbmp/index.en Thu Apr 30 08:33:01 2009
@@ -47,6 +47,12 @@
<p>Libnsbmp is licensed under the <a href="http://opensource.org/licenses/mit-license.php">MIT Licence</a>.</p>
+<h2>Releases</h2>
+
+<ul>
+<li><a href="../releases/libnsbmp-0.0.1-src.tar.gz">Libnsbmp 0.0.1 tarball</a></li>
+</ul>
+
<h2>Contact</h2>
<p>If you would like to discuss Libnsbmp, please join the NetSurf <a href="http://www.netsurf-browser.org/lists/netsurf-dev">developer mailing list</a>.</p>
Modified: trunk/netsurfweb/projects/libnsgif/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/projects/libnsgif/inde...
==============================================================================
--- trunk/netsurfweb/projects/libnsgif/index.en (original)
+++ trunk/netsurfweb/projects/libnsgif/index.en Thu Apr 30 08:33:01 2009
@@ -46,6 +46,12 @@
<p>Libnsgif is licensed under the <a href="http://opensource.org/licenses/mit-license.php">MIT Licence</a>.</p>
+<h2>Releases</h2>
+
+<ul>
+<li><a href="../releases/libnsgif-0.0.1-src.tar.gz">Libnsgif 0.0.1 tarball</a></li>
+</ul>
+
<h2>Contact</h2>
<p>If you would like to discuss Libnsgif, please join the NetSurf <a href="http://www.netsurf-browser.org/lists/netsurf-dev">developer mailing list</a>.</p>
Modified: trunk/netsurfweb/projects/libparserutils/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/projects/libparserutil...
==============================================================================
--- trunk/netsurfweb/projects/libparserutils/index.en (original)
+++ trunk/netsurfweb/projects/libparserutils/index.en Thu Apr 30 08:33:01 2009
@@ -68,6 +68,12 @@
<p>LibParserUtils is licensed under the <a href="http://opensource.org/licenses/mit-license.php">MIT Licence</a>.</p>
+<h2>Releases</h2>
+
+<ul>
+<li><a href="../releases/libparserutils-0.0.1-src.tar.gz">LibParserUtils 0.0.1 tarball</a></li>
+</ul>
+
<h2>Contact</h2>
<p>If you would like to help develop LibParserUtils, or have questions about the library, please join the NetSurf <a href="http://www.netsurf-browser.org/lists/netsurf-dev">developer mailing list</a>.</p>
14 years, 4 months
r7378 MarkieB - /branches/MarkieB/search/
by netsurf＠semichrome.net
Author: MarkieB
Date: Thu Apr 30 06:11:12 2009
New Revision: 7378
URL: http://source.netsurf-browser.org?rev=7378&view=rev
Log:
Initialized merge tracking via "svnmerge" with revisions "1-7292" from
svn://svn.netsurf-browser.org/trunk/netsurf
Modified:
branches/MarkieB/search/ (props changed)
Propchange: branches/MarkieB/search/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 30 06:11:12 2009
@@ -1,1 +1,1 @@
-/branches/adamblokus/netsurf:1-5155 /branches/dynis/netsurf:1-4310,4345-4486 /branches/mikeL/netsurf:1-4272,4275-4285,4287-5188 /branches/takkaria/netsurf-hubbub:1-5018 /branches/vince/netsurf-fb:1-5422
+/branches/dynis/netsurf:1-4310,4345-4486 /branches/adamblokus/netsurf:1-5155 /branches/takkaria/netsurf-hubbub:1-5018 /branches/mikeL/netsurf:1-4272,4275-4285,4287-5188 /branches/vince/netsurf-fb:1-5422 /trunk/netsurf:1-7292
14 years, 4 months
r7377 MarkieB - /branches/MarkieB/favs/amiga/gui.c
by netsurf＠semichrome.net
Author: MarkieB
Date: Thu Apr 30 05:16:42 2009
New Revision: 7377
URL: http://source.netsurf-browser.org?rev=7377&view=rev
Log:
one typo in the resolution
Modified:
branches/MarkieB/favs/amiga/gui.c
Modified: branches/MarkieB/favs/amiga/gui.c
URL: http://source.netsurf-browser.org/branches/MarkieB/favs/amiga/gui.c?rev=7...
==============================================================================
--- branches/MarkieB/favs/amiga/gui.c (original)
+++ branches/MarkieB/favs/amiga/gui.c Thu Apr 30 05:16:42 2009
@@ -471,8 +471,8 @@
if(screenmodereq = AllocAslRequest(ASL_ScreenModeRequest,NULL))
{
AslRequestTags(screenmodereq,
- ASLSM_MinDepth,16,
- ASLSM_MaxDepth,24,
+ ASLSM_MinDepth,24,
+ ASLSM_MaxDepth,32,
TAG_DONE);
id = screenmodereq->sm_DisplayID;
14 years, 4 months
r7376 MarkieB - in /branches/MarkieB/favs: amiga/gui.c gtk/dialogs/gtk_options.c
by netsurf＠semichrome.net
Author: MarkieB
Date: Thu Apr 30 05:07:37 2009
New Revision: 7376
URL: http://source.netsurf-browser.org?rev=7376&view=rev
Log:
resolve hopefully last remaining conflicts
Modified:
branches/MarkieB/favs/amiga/gui.c
branches/MarkieB/favs/gtk/dialogs/gtk_options.c
Modified: branches/MarkieB/favs/amiga/gui.c
URL: http://source.netsurf-browser.org/branches/MarkieB/favs/amiga/gui.c?rev=7...
==============================================================================
--- branches/MarkieB/favs/amiga/gui.c (original)
+++ branches/MarkieB/favs/amiga/gui.c Thu Apr 30 05:07:37 2009
@@ -460,7 +460,7 @@
if(notalreadyrunning)
{
- if((option_modeid) && (option_modeid[0] != '\0'))
+ if((option_modeid) && (strncmp(option_modeid,"0x",2) == 0))
{
id = strtoul(option_modeid,NULL,0);
}
@@ -472,7 +472,7 @@
{
AslRequestTags(screenmodereq,
ASLSM_MinDepth,16,
- ASLSM_MaxDepth,32,
+ ASLSM_MaxDepth,24,
TAG_DONE);
id = screenmodereq->sm_DisplayID;
@@ -2708,7 +2708,11 @@
if(((x-xs) <= 0) || ((x-xs+2) >= (bbox->Width)) || ((y-ys) <= 0) || ((y-ys) >= (bbox->Height))) return;
+ SetDrMd(g->shared->win->RPort,COMPLEMENT);
+
RectFill(g->shared->win->RPort,x+bbox->Left-xs,y+bbox->Top-ys,x+bbox->Left+2-xs,y+bbox->Top+height-ys);
+
+ SetDrMd(g->shared->win->RPort,JAM1);
g->c_x = x;
g->c_y = y;
@@ -2822,8 +2826,8 @@
wheel = (struct IntuiWheelData *)msg->IAddress;
gui_window_set_scroll(gwin->bw->window,
- gwin->bw->window->scrollx + (wheel->WheelX * 10),
- gwin->bw->window->scrolly + (wheel->WheelY * 10));
+ gwin->bw->window->scrollx + (wheel->WheelX * 20),
+ gwin->bw->window->scrolly + (wheel->WheelY * 20));
}
break;
}
Modified: branches/MarkieB/favs/gtk/dialogs/gtk_options.c
URL: http://source.netsurf-browser.org/branches/MarkieB/favs/gtk/dialogs/gtk_o...
==============================================================================
--- branches/MarkieB/favs/gtk/dialogs/gtk_options.c (original)
+++ branches/MarkieB/favs/gtk/dialogs/gtk_options.c Thu Apr 30 05:07:37 2009
@@ -295,6 +295,7 @@
warn_user("FileError", (const char *) languagefile);
return;
}
+
while (fgets(buf, sizeof(buf), fp)) {
/* Ignore blank lines */
if (buf[0] == '\0')
@@ -315,7 +316,6 @@
gtk_combo_box_set_active(GTK_COMBO_BOX(comboLanguage), active_language);
/** \todo localisation */
-
gtk_widget_set_tooltip_text(GTK_WIDGET(comboLanguage),
"set preferred language for web pages");
gtk_box_pack_start(GTK_BOX(combolanguagevbox),
@@ -498,6 +498,7 @@
free(old_lang);
g_free(lang);
+
return FALSE;
}
@@ -652,6 +653,7 @@
COMBO_CHANGED(comboButtonType, option_button_type)
struct gui_window *current = window_list;
+
while (current) {
switch(option_button_type) {
case 0:
14 years, 4 months
r7375 MarkieB - /branches/MarkieB/favs/gtk/dialogs/gtk_options.c
by netsurf＠semichrome.net
Author: MarkieB
Date: Thu Apr 30 04:52:33 2009
New Revision: 7375
URL: http://source.netsurf-browser.org?rev=7375&view=rev
Log:
complete integration of r7370
Modified:
branches/MarkieB/favs/gtk/dialogs/gtk_options.c
Modified: branches/MarkieB/favs/gtk/dialogs/gtk_options.c
URL: http://source.netsurf-browser.org/branches/MarkieB/favs/gtk/dialogs/gtk_o...
==============================================================================
--- branches/MarkieB/favs/gtk/dialogs/gtk_options.c (original)
+++ branches/MarkieB/favs/gtk/dialogs/gtk_options.c Thu Apr 30 04:52:33 2009
@@ -344,16 +344,20 @@
SET_COMBO(comboProxyType, proxytype);
SET_ENTRY(entryProxyHost,
option_http_proxy_host ? option_http_proxy_host : "");
- gtk_widget_set_sensitive (entryProxyHost, proxytype != 0);
- snprintf(b, 20, "%d", option_http_proxy_port);
- SET_ENTRY(entryProxyPort, b);
- gtk_widget_set_sensitive (entryProxyPort, proxytype != 0);
+ gtk_widget_set_sensitive(entryProxyHost, proxytype != 0);
+
+ snprintf(buf, sizeof(buf), "%d", option_http_proxy_port);
+
+ SET_ENTRY(entryProxyPort, buf);
+ gtk_widget_set_sensitive(entryProxyPort, proxytype != 0);
+
SET_ENTRY(entryProxyUser, option_http_proxy_auth_user ?
option_http_proxy_auth_user : "");
- gtk_widget_set_sensitive (entryProxyUser, proxytype != 0);
+ gtk_widget_set_sensitive(entryProxyUser, proxytype != 0);
+
SET_ENTRY(entryProxyPassword, option_http_proxy_auth_pass ?
option_http_proxy_auth_pass : "");
- gtk_widget_set_sensitive (entryProxyPassword, proxytype != 0);
+ gtk_widget_set_sensitive(entryProxyPassword, proxytype != 0);
SET_SPIN(spinMaxFetchers, option_max_fetchers);
SET_SPIN(spinFetchesPerHost, option_max_fetchers_per_host);
14 years, 4 months