Skip to content

GitLab

Commit 38311b72 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Remove beep on error and file dragging options 

Now in Sound Setup and Filer Setup respectively.
This is still a confused plugin.

Version 0.14. Tagged as 'WindSetup-0_14'
parent db140b3c
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 36 deletions
Resources/UK/Res,fae
View file @ 38311b72
No preview for this file type
VersionNum
View file @ 38311b72
/* (0.13)
/* (0.14)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.13
#define Module_MajorVersion_CMHG 0.14
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 17 Jul 2013
#define Module_Date_CMHG 20 Jul 2013
#define Module_MajorVersion "0.13"
#define Module_Version 13
#define Module_MajorVersion "0.14"
#define Module_Version 14
#define Module_MinorVersion ""
#define Module_Date "17 Jul 2013"
#define Module_Date "20 Jul 2013"
#define Module_ApplicationDate "17-Jul-13"
#define Module_ApplicationDate "20-Jul-13"
#define Module_ComponentName "WindSetup"
#define Module_ComponentPath "castle/RiscOS/Sources/SystemRes/Configure2/PlugIns/WindSetup"
#define Module_FullVersion "0.13"
#define Module_HelpVersion "0.13 (17 Jul 2013)"
#define Module_LibraryVersionInfo "0:13"
#define Module_FullVersion "0.14"
#define Module_HelpVersion "0.14 (20 Jul 2013)"
#define Module_LibraryVersionInfo "0:14"
c/Settings
View file @ 38311b72
......@@ -44,16 +44,14 @@ Date Who Change
#include "Main.h"
#include "Settings.h" /* includes prototypes for this file */
const cmos cmos_details [15] ={ { 0xDE, 7, 1 }, /* WimpIconiseButton */
const cmos cmos_details [14] ={ { 0xDE, 7, 1 }, /* WimpIconiseButton */
{ 0x8C, 5, 1 }, /* WimpSpritePrecedence */
{ 0x1C, 1, 1 }, /* DragASprite */
{ 0x1C, 4, 1 }, /* WimpShiftToggle */
{ 0x8C, 7, 1 }, /* DesktopTileStatus */
{ 0xC5, 0, 1 }, /* WimpFlagsInstantDragMove */
{ 0xC5, 1, 1 }, /* WimpFlagsInstantDragResize */
{ 0xC5, 2, 1 }, /* WimpFlagsInstantDragHScroll */
{ 0xC5, 3, 1 }, /* WimpFlagsInstantDragVScroll */
{ 0xC5, 4, 1 }, /* WimpFlagsErrorAction */
{ 0xC5, 5, 1 }, /* WimpFlagsConfinementBR */
{ 0xC5, 6, 1 }, /* WimpFlagsConfinementTL */
{ 0x17, 5, 3 }, /* (WimpIconBarSpeed index) EOR 4 */
......@@ -75,7 +73,6 @@ void settings_read (int(*get)(cmos item, void *messages))
throw (optionbutton_set_state (0, mainwindow_id, mainwindow_dragresize, get (WimpFlagsInstantDragResize, &messages)));
throw (optionbutton_set_state (0, mainwindow_id, mainwindow_draghscroll, get (WimpFlagsInstantDragHScroll, &messages)));
throw (optionbutton_set_state (0, mainwindow_id, mainwindow_dragvscroll, get (WimpFlagsInstantDragVScroll, &messages)));
throw (optionbutton_set_state (0, mainwindow_id, mainwindow_dragfiles, get (DragASprite, &messages)));
//
throw (optionbutton_set_state (0, mainwindow_id, mainwindow_bandr, get (WimpFlagsConfinementBR, &messages)));
throw (optionbutton_set_state (0, mainwindow_id, mainwindow_tandl, get (WimpFlagsConfinementTL, &messages)));
......@@ -89,7 +86,6 @@ void settings_read (int(*get)(cmos item, void *messages))
//
throw (optionbutton_set_state (0, mainwindow_id, mainwindow_shifttoggle, !get (WimpShiftToggle, &messages)));
throw (optionbutton_set_state (0, mainwindow_id, mainwindow_textures, !get (DesktopTileStatus, &messages)));
throw (optionbutton_set_state (0, mainwindow_id, mainwindow_errorbeep, !get (WimpFlagsErrorAction, &messages)));
throw (optionbutton_set_state (0, mainwindow_id, mainwindow_clickrelease, !get (ClickReleaseButtons, &messages)));
throw (optionbutton_set_state (0, mainwindow_id, mainwindow_icons, get (ROMIconProtect, &messages)));
throw (optionbutton_set_state (0, mainwindow_id, mainwindow_iconise, get (IconiseButton, &messages)));
......@@ -116,8 +112,6 @@ BOOL settings_write (void)
cmos_write (WimpFlagsInstantDragHScroll, value);
throw (optionbutton_get_state (0, mainwindow_id, mainwindow_dragvscroll, &value));
cmos_write (WimpFlagsInstantDragVScroll, value);
throw (optionbutton_get_state (0, mainwindow_id, mainwindow_dragfiles, &value));
cmos_write (DragASprite, value);
//
throw (optionbutton_get_state (0, mainwindow_id, mainwindow_bandr, &value));
cmos_write (WimpFlagsConfinementBR, value);
......@@ -138,9 +132,6 @@ BOOL settings_write (void)
throw (optionbutton_get_state (0, mainwindow_id, mainwindow_textures, &value));
cmos_write (DesktopTileStatus, !value);
if (value != ovalue) reassert_mode = TRUE;
//
throw (optionbutton_get_state (0, mainwindow_id, mainwindow_errorbeep, &value));
cmos_write (WimpFlagsErrorAction, !value);
//
throw (optionbutton_get_state (0, mainwindow_id, mainwindow_clickrelease, &value));
if (0 == value)
......
h/Settings
View file @ 38311b72
......@@ -41,25 +41,22 @@ Date Who Change
#define IconiseButton ((cmos) cmos_details[0])
#define ROMIconProtect ((cmos) cmos_details[1])
#define DragASprite ((cmos) cmos_details[2])
#define WimpShiftToggle ((cmos) cmos_details[3])
#define DesktopTileStatus ((cmos) cmos_details[4])
#define WimpFlagsInstantDragMove ((cmos) cmos_details[5])
#define WimpFlagsInstantDragResize ((cmos) cmos_details[6])
#define WimpFlagsInstantDragHScroll ((cmos) cmos_details[7])
#define WimpFlagsInstantDragVScroll ((cmos) cmos_details[8])
#define WimpFlagsErrorAction ((cmos) cmos_details[9])
#define WimpFlagsConfinementBR ((cmos) cmos_details[10])
#define WimpFlagsConfinementTL ((cmos) cmos_details[11])
#define IconBarSpeed ((cmos) cmos_details[12])
#define IconBarAcceleration ((cmos) cmos_details[13])
#define ClickReleaseButtons ((cmos) cmos_details[14])
#define WimpShiftToggle ((cmos) cmos_details[2])
#define DesktopTileStatus ((cmos) cmos_details[3])
#define WimpFlagsInstantDragMove ((cmos) cmos_details[4])
#define WimpFlagsInstantDragResize ((cmos) cmos_details[5])
#define WimpFlagsInstantDragHScroll ((cmos) cmos_details[6])
#define WimpFlagsInstantDragVScroll ((cmos) cmos_details[7])
#define WimpFlagsConfinementBR ((cmos) cmos_details[8])
#define WimpFlagsConfinementTL ((cmos) cmos_details[9])
#define IconBarSpeed ((cmos) cmos_details[10])
#define IconBarAcceleration ((cmos) cmos_details[11])
#define ClickReleaseButtons ((cmos) cmos_details[12])
#define mainwindow_dragmove ((ComponentId) 0x001)
#define mainwindow_dragresize ((ComponentId) 0x002)
#define mainwindow_draghscroll ((ComponentId) 0x003)
#define mainwindow_dragvscroll ((ComponentId) 0x004)
#define mainwindow_dragfiles ((ComponentId) 0x005)
#define mainwindow_dragall ((ComponentId) 0x006)
#define mainwindow_dragnone ((ComponentId) 0x007)
#define mainwindow_bandr ((ComponentId) 0x009)
......@@ -70,7 +67,6 @@ Date Who Change
#define mainwindow_accel2 ((ComponentId) 0x01a)
#define mainwindow_shifttoggle ((ComponentId) 0x012)
#define mainwindow_textures ((ComponentId) 0x013)
#define mainwindow_errorbeep ((ComponentId) 0x014)
#define mainwindow_clickrelease ((ComponentId) 0x018)
#define mainwindow_icons ((ComponentId) 0x015)
#define mainwindow_iconise ((ComponentId) 0x016)
......@@ -79,7 +75,7 @@ Date Who Change
#define mainwindow_default ((ComponentId) 0x102)
#define mainwindow_dragmin ((ComponentId) 0x001)
#define mainwindow_dragmax ((ComponentId) 0x005)
#define mainwindow_dragmax ((ComponentId) 0x004)
/* Global variables */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment