diff options
-rw-r--r-- | dillorc2 | 7 | ||||
-rw-r--r-- | src/html.cc | 5 | ||||
-rw-r--r-- | src/prefs.c | 12 | ||||
-rw-r--r-- | src/prefs.h | 2 |
4 files changed, 1 insertions, 25 deletions
@@ -48,9 +48,6 @@ fw_fontname="DejaVu Sans Mono" #font_factor=1.2 #font_factor=1.5 -# If you prefer oblique over italic fonts, uncoment next line -#use_oblique=YES - # Show tooltip popup for images? # Note: We use the "title" attribute and not "alt". # More info at: http://bugzilla.mozilla.org/show_bug.cgi?id=25537 @@ -174,10 +171,6 @@ show_menubar=YES # Start dillo windows with a hidden panel? fullwindow_start=NO -# Enabling this will restrain OpenUrl and FindText, but may be required -# for the ION window manager. -transient_dialogs=NO - # When filling forms, our default behaviour is to submit on enterpress, # but only when there's a single text entry (to avoid incomplete submits). # OTOH, if you have to fill the same form lots of times, you may find diff --git a/src/html.cc b/src/html.cc index 04362159..998a1748 100644 --- a/src/html.cc +++ b/src/html.cc @@ -605,10 +605,7 @@ static void Html_set_top_font(DilloHtml *html, const char *name, int size, if (BImask & 1) font_attrs.weight = (BI & 1) ? 700 : 400; if (BImask & 2) - font_attrs.style = (BI & 2) ? - (prefs.use_oblique ? - FONT_STYLE_OBLIQUE : FONT_STYLE_ITALIC) : - FONT_STYLE_NORMAL; + font_attrs.style = (BI & 2) ? FONT_STYLE_ITALIC : FONT_STYLE_NORMAL; HTML_SET_TOP_ATTR (html, font, Font::create (HT2LT(html), &font_attrs)); diff --git a/src/prefs.c b/src/prefs.c index 1997493b..d1b0bcf8 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -102,9 +102,7 @@ typedef enum { DRC_TOKEN_STANDARD_WIDGET_COLORS, DRC_TOKEN_START_PAGE, DRC_TOKEN_TEXT_COLOR, - DRC_TOKEN_TRANSIENT_DIALOGS, DRC_TOKEN_USE_DICACHE, - DRC_TOKEN_USE_OBLIQUE, DRC_TOKEN_VISITED_COLOR, DRC_TOKEN_VW_FONT, DRC_TOKEN_W3C_PLUS_HEURISTICS @@ -163,9 +161,7 @@ static const SymNode_t symbols[] = { { "standard_widget_colors", DRC_TOKEN_STANDARD_WIDGET_COLORS }, { "start_page", DRC_TOKEN_START_PAGE }, { "text_color", DRC_TOKEN_TEXT_COLOR }, - { "transient_dialogs", DRC_TOKEN_TRANSIENT_DIALOGS }, { "use_dicache", DRC_TOKEN_USE_DICACHE }, - { "use_oblique", DRC_TOKEN_USE_OBLIQUE }, { "visited_color", DRC_TOKEN_VISITED_COLOR, }, { "vw_fontname", DRC_TOKEN_VW_FONT }, { "w3c_plus_heuristics", DRC_TOKEN_W3C_PLUS_HEURISTICS } @@ -246,9 +242,6 @@ static int Prefs_parse_pair(char *name, char *value) case DRC_TOKEN_STANDARD_WIDGET_COLORS: prefs.standard_widget_colors = (strcmp(value, "YES") == 0); break; - case DRC_TOKEN_USE_OBLIQUE: - prefs.use_oblique = (strcmp(value, "YES") == 0); - break; case DRC_TOKEN_PANEL_SIZE: if (!dStrcasecmp(value, "tiny")) prefs.panel_size = P_tiny; @@ -327,9 +320,6 @@ static int Prefs_parse_pair(char *name, char *value) case DRC_TOKEN_LOAD_IMAGES: prefs.load_images = (strcmp(value, "YES") == 0); break; - case DRC_TOKEN_TRANSIENT_DIALOGS: - prefs.transient_dialogs = (strcmp(value, "YES") == 0); - break; case DRC_TOKEN_FW_FONT: dFree(prefs.fw_fontname); prefs.fw_fontname = dStrdup(value); @@ -423,7 +413,6 @@ void a_Prefs_init(void) prefs.visited_color = DW_COLOR_DEFAULT_PURPLE; prefs.bg_color = DW_COLOR_DEFAULT_BGND; prefs.text_color = DW_COLOR_DEFAULT_BLACK; - prefs.use_oblique = FALSE; prefs.start_page = a_Url_new(DILLO_START_PAGE, NULL, 0, 0, 0); prefs.home = a_Url_new(DILLO_HOME, NULL, 0, 0, 0); prefs.allow_white_bg = TRUE; @@ -451,7 +440,6 @@ void a_Prefs_init(void) prefs.show_progress_box=TRUE; prefs.fullwindow_start=FALSE; prefs.load_images=TRUE; - prefs.transient_dialogs=FALSE; prefs.vw_fontname = dStrdup(D_VW_FONTNAME); prefs.fw_fontname = dStrdup(D_FW_FONTNAME); prefs.generate_submit = FALSE; diff --git a/src/prefs.h b/src/prefs.h index e9636466..f162e8f5 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -28,7 +28,6 @@ struct _DilloPrefs { int32_t bg_color; int32_t text_color; bool_t allow_white_bg; - bool_t use_oblique; bool_t force_my_colors; bool_t contrast_visited_color; bool_t standard_widget_colors; @@ -53,7 +52,6 @@ struct _DilloPrefs { bool_t show_progress_box; bool_t fullwindow_start; bool_t load_images; - bool_t transient_dialogs; char *vw_fontname; char *fw_fontname; bool_t generate_submit; |