Removed screenv2 support.

Electronprod · May 17, 2024 · 41d16ba · 41d16ba
1 parent f2fbc9d
commit 41d16ba
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 96 deletions.
diff --git a/scripts/msgbox.vbs b/scripts/msgbox.vbs
@@ -0,0 +1 @@
+x=msgbox("Text" ,0, "Title")
diff --git a/src/electron/RAT_server.java b/src/electron/RAT_server.java
@@ -6,7 +6,6 @@
 
 import electron.console.Console;
 import electron.networking.Listener;
-import electron.networking.ScreenV2Receiver;
 import electron.utils.Utils;
 import electron.utils.logger;
 import electron.web.Loader;
@@ -59,7 +58,6 @@ public static void main(String[] args) {
 		logger.log("Starting application in mode: " + inputmode);
 		// Starting network listener
 		new Listener(listenerport).start();
-		new ScreenV2Receiver().start();
 		Utils.loadDir(new File("scripts"));
 		switch (inputmode) {
 		case 0:

diff --git a/src/electron/gui/MainWindowControls.java b/src/electron/gui/MainWindowControls.java
@@ -15,7 +15,6 @@
 import electron.actions.Scripting;
 import electron.actions.Taskmgr;
 import electron.networking.NetData;
-import electron.networking.ScreenV2Receiver;
 import electron.networking.SocketHandler;
 import electron.networking.packets.ClientInfo;
 import electron.networking.packets.ProcessPacket;
@@ -126,16 +125,12 @@ public class MainWindowControls {
 	@FXML
 	private TextField screen_keyfield;
 	@FXML
-	private ImageView screenv2_image;
-	@FXML
 	private TextArea script_code;
 	@FXML
 	private ChoiceBox<String> script_executor;
 	@FXML
 	private TextField settings_uitimeupdater;
 	@FXML
-	private CheckBox settings_screenv2;
-	@FXML
 	private CheckBox settings_contextmenurexplorer;
 
 	@FXML
@@ -179,7 +174,6 @@ public void run() {
 				while (true) {
 					Platform.runLater(() -> {
 						viewChaged();
-						tab_screenv2.setDisable(!settings_screenv2.isSelected());
 					});
 					try {
 						Thread.currentThread().sleep(Integer.parseInt(settings_uitimeupdater.getText()));
@@ -305,8 +299,6 @@ private void viewChaged() {
 			updateExplorer();
 		} else if (tabName.equals("Screen")) {
 			updateScreen();
-		} else if (tabName.equals("ScreenV2")) {
-			updateScreenV2();
 		} else if (tabName.equals("Tasks")) {
 			updateTasks();
 		} else {
@@ -497,32 +489,6 @@ private void settings_launchPlayerGui() {
 		OutputPacket.sendOutPacket("/player soundpacket", handler);
 	}
 
-	/*
-	 * ScreenV2 Tab Controls
-	 */
-	private void updateScreenV2() {
-		if (handler == null || ScreenV2Receiver.getImage() == null) {
-			return;
-		}
-		WritableImage img = SwingFXUtils.toFXImage(ScreenV2Receiver.getImage(), null);
-		screenv2_image.setImage(img);
-	}
-
-	@FXML
-	private void freezeScreenV2() {
-		FreezeScreenImage.paint(ScreenV2Receiver.getImage());
-	}
-
-	@FXML
-	private void toggleScreenV2() {
-		if (handler == null) {
-			Utils.showErrorMessage("Incorrect action", "You must select client first!",
-					"Select client in 'Connections' pane firstly.");
-			return;
-		}
-		Misc.toggle_screenV2(handler);
-	}
-
 	/*
 	 * Explorer Tab Controls
 	 */

diff --git a/src/electron/networking/ScreenV2Receiver.java b/src/electron/networking/ScreenV2Receiver.java
diff --git a/src/electron/user/resources/mainwindow.fxml b/src/electron/user/resources/mainwindow.fxml
@@ -72,17 +72,6 @@
             </SplitPane>
          </content>
       </Tab>
-      <Tab fx:id="tab_screenv2" closable="false" text="ScreenV2">
-         <content>
-            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-               <children>
-                  <Button layoutX="514.0" layoutY="344.0" mnemonicParsing="false" onAction="#freezeScreenV2" prefHeight="19.0" prefWidth="71.0" text="Freeze" textAlignment="CENTER" AnchorPane.bottomAnchor="1.3333333333333535" AnchorPane.rightAnchor="14.666666666666671" />
-                  <Button layoutX="455.0" layoutY="344.0" mnemonicParsing="false" onAction="#toggleScreenV2" text="Toggle" AnchorPane.bottomAnchor="1.3333333333333535" AnchorPane.rightAnchor="93.0" />
-                  <ImageView fx:id="screenv2_image" fitHeight="323.0" fitWidth="574.0" layoutX="14.0" layoutY="14.0" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="33.666666666666686" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="13.333333333333371" />
-               </children>
-            </AnchorPane>
-         </content>
-      </Tab>
     <Tab closable="false" text="Explorer">
       <content>
         <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
@@ -229,11 +218,6 @@
                               <Font name="Cambria Math" size="12.0" />
                            </font>
                         </Text>
-                        <CheckBox fx:id="settings_screenv2" layoutX="14.0" layoutY="47.0" mnemonicParsing="false" text="Enable ScreenV2 (Feature is in developing)" AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="47.0">
-                           <font>
-                              <Font name="Cambria Math" size="12.0" />
-                           </font>
-                        </CheckBox>
                         <CheckBox fx:id="settings_contextmenurexplorer" layoutX="14.0" layoutY="73.0" mnemonicParsing="false" text="Disable context menu restrictions (Explorer)" AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="70.0">
                            <font>
                               <Font name="Cambria Math" size="12.0" />