Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6966f44 authored by Ethan Yonker's avatar Ethan Yonker
Browse files

Fix unable to uncheck the mount read only check box 

Change-Id: I1bbc25df6f35f79549f1eb06feb4db9ec0475aa5
parent 46bdc968

gui/action.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1798,7 +1798,7 @@ int GUIAction::mountsystemtoggle(std::string arg) 
	} else {

		TWPartition* Part = PartitionManager.Find_Partition_By_Path("/system");

		if (Part) {

			if (DataManager::GetIntValue("tw_mount_system_ro")) {

			if (arg == "0") {

				DataManager::SetValue("tw_mount_system_ro", 0);

				Part->Change_Mount_Read_Only(false);

			} else {

gui/devices/landscape/res/landscape.xml

+9 −12
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ 
				<condition var1="tw_mount_system_ro" op="=" var2="0" />

				<text>Only mount system read-only</text>

				<image resource="checkbox_false" />

				<action function="mountsystemtoggle"></action>

				<action function="mountsystemtoggle">1</action>

			</object>



			<object type="button">
@@ -1062,18 +1062,15 @@ 
			</object>



			<object type="action">

				<conditions>

					<condition var1="tw_operation_state" var2="1" />

				<condition var1="tw_lifetime_writes" var2="1" />

				</conditions>

				<actions>

					<action function="mountsystemtoggle">0</action>

					<action function="page">mount</action>

				</actions>

			</object>



			<object type="action">

				<conditions>

					<condition var1="tw_operation_state" var2="1" />

				<condition var1="tw_lifetime_writes" var2="0" />

				</conditions>

				<actions>

					<action function="set">tw_back=mount</action>

					<action function="page">system_readonly</action>
@@ -3696,7 +3693,7 @@ 
				<placement x="%col_center_x%" y="%row7_text_y%" />

				<text>Keep Read Only</text>

				<actions>

					<action function="set">tw_mount_system_ro=1</action>

					<action function="mountsystemtoggle">1</action>

					<action function="set">tw_page_done=1</action>

					<action function="page">%tw_back%</action>

				</actions>
@@ -3705,7 +3702,7 @@ 
			<object type="slider">

				<text>Swipe to Allow Modifications</text>

				<actions>

					<action function="set">tw_mount_system_ro=0</action>

					<action function="mountsystemtoggle">0</action>

					<action function="set">tw_page_done=1</action>

					<action function="page">%tw_back%</action>

				</actions>

gui/devices/portrait/res/portrait.xml

+9 −12
Original line number Diff line number Diff line
@@ -2130,7 +2130,7 @@ 
				<condition var1="tw_mount_system_ro" op="=" var2="0" />

				<text>Only mount system read-only</text>

				<image resource="checkbox_false" />

				<action function="mountsystemtoggle"></action>

				<action function="mountsystemtoggle">1</action>

			</object>



			<object type="button">
@@ -2207,18 +2207,15 @@ 
			</object>



			<object type="action">

				<conditions>

					<condition var1="tw_operation_state" var2="1" />

				<condition var1="tw_lifetime_writes" var2="1" />

				</conditions>

				<actions>

					<action function="mountsystemtoggle">0</action>

					<action function="page">mount</action>

				</actions>

			</object>



			<object type="action">

				<conditions>

					<condition var1="tw_operation_state" var2="1" />

				<condition var1="tw_lifetime_writes" var2="0" />

				</conditions>

				<actions>

					<action function="set">tw_back=mount</action>

					<action function="page">system_readonly</action>
@@ -3722,7 +3719,7 @@ 
				<placement x="%col_center_x%" y="%row10_text_y%" />

				<text>Keep Read Only</text>

				<actions>

					<action function="set">tw_mount_system_ro=1</action>

					<action function="mountsystemtoggle">1</action>

					<action function="set">tw_page_done=1</action>

					<action function="page">%tw_back%</action>

				</actions>
@@ -3731,7 +3728,7 @@ 
			<object type="slider">

				<text>Swipe to Allow Modifications</text>

				<actions>

					<action function="set">tw_mount_system_ro=0</action>

					<action function="mountsystemtoggle">0</action>

					<action function="set">tw_page_done=1</action>

					<action function="page">%tw_back%</action>

				</actions>

gui/devices/watch/res/watch.xml

+9 −12
Original line number Diff line number Diff line
@@ -2138,7 +2138,7 @@ 
				<condition var1="tw_mount_system_ro" op="=" var2="0" />

				<text>Only mount system read-only</text>

				<image resource="checkbox_false" />

				<action function="mountsystemtoggle"></action>

				<action function="mountsystemtoggle">1</action>

			</object>



			<object type="button">
@@ -2214,18 +2214,15 @@ 
			</object>



			<object type="action">

				<conditions>

					<condition var1="tw_operation_state" var2="1" />

				<condition var1="tw_lifetime_writes" var2="1" />

				</conditions>

				<actions>

					<action function="mountsystemtoggle">0</action>

					<action function="page">mount</action>

				</actions>

			</object>



			<object type="action">

				<conditions>

					<condition var1="tw_operation_state" var2="1" />

				<condition var1="tw_lifetime_writes" var2="0" />

				</conditions>

				<actions>

					<action function="set">tw_back=mount</action>

					<action function="page">system_readonly</action>
@@ -3711,7 +3708,7 @@ 
				<placement x="%col_center_x%" y="%row9_text_y%" />

				<text>Keep Read Only</text>

				<actions>

					<action function="set">tw_mount_system_ro=1</action>

					<action function="mountsystemtoggle">1</action>

					<action function="set">tw_page_done=1</action>

					<action function="page">%tw_back%</action>

				</actions>
@@ -3720,7 +3717,7 @@ 
			<object type="slider">

				<text>Swipe to Allow Modifications</text>

				<actions>

					<action function="set">tw_mount_system_ro=0</action>

					<action function="mountsystemtoggle">0</action>

					<action function="set">tw_page_done=1</action>

					<action function="page">%tw_back%</action>

				</actions>