Skip to content

Commit

Permalink
Merge pull request #182 from AY2324S2-CS2103T-W12-3/181-save-log-file…
Browse files Browse the repository at this point in the history
…s-rename

Rename save and log files
  • Loading branch information
yisiox authored Apr 5, 2024
2 parents 94da53e + 664cc3f commit efe0fad
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/commons/core/LogsCenter.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class LogsCenter {

private static final int MAX_FILE_COUNT = 5;
private static final int MAX_FILE_SIZE_IN_BYTES = (int) (Math.pow(2, 20) * 5); // 5MB
private static final String LOG_FILE = "addressbook.log";
private static final String LOG_FILE = "assetbook.log";
private static final Logger logger; // logger for this class
private static Logger baseLogger; // to be used as the parent of all other loggers created by this class.
private static Level currentLogLevel = Level.INFO;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/model/UserPrefs.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
public class UserPrefs implements ReadOnlyUserPrefs {

private GuiSettings guiSettings = new GuiSettings();
private Path addressBookFilePath = Paths.get("data" , "addressbook.json");
private Path addressBookFilePath = Paths.get("data" , "assetbook.json");

/**
* Creates a {@code UserPrefs} with default values.
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/seedu/address/ui/UiManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
import javafx.scene.image.Image;
import javafx.scene.text.Font;
import javafx.stage.Stage;
import seedu.address.MainApp;
import seedu.address.commons.core.LogsCenter;
Expand Down Expand Up @@ -36,9 +37,12 @@ public UiManager(Logic logic) {
public void start(Stage primaryStage) {
logger.info("Starting UI...");

//Set the application icon.
// Set the application icon
primaryStage.getIcons().add(getImage(ICON_APPLICATION));

// Load custom fonts
Font.loadFont(getClass().getResourceAsStream("/styles/JetBrainsMono-SemiBold.ttf"), 16);

try {
mainWindow = new MainWindow(primaryStage, logic);
} catch (Throwable e) {
Expand Down
Binary file not shown.
8 changes: 7 additions & 1 deletion src/main/resources/view/DarkTheme.css
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,13 @@
-fx-text-fill: white;
}

.cell_big_label {
.cell_big_index {
-fx-font-family: "JetBrains Mono SemiBold";
-fx-font-size: 16px;
-fx-text-fill: #010504;
}

.cell_big_name {
-fx-font-family: "Segoe UI Semibold";
-fx-font-size: 16px;
-fx-text-fill: #010504;
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/view/PersonListCard.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
<padding>
<Insets top="5" right="5" bottom="5" left="15" />
</padding>
<HBox spacing="5" alignment="CENTER_LEFT">
<Label fx:id="id" styleClass="cell_big_label">
<HBox alignment="CENTER_LEFT">
<Label fx:id="id" styleClass="cell_big_index">
<minWidth>
<!-- Ensures that the label text is never truncated -->
<Region fx:constant="USE_PREF_SIZE" />
</minWidth>
</Label>
<Label fx:id="name" text="\$first" styleClass="cell_big_label" />
<Label fx:id="name" text="\$first" styleClass="cell_big_name" />
</HBox>
<FlowPane fx:id="tags" />
<FlowPane fx:id="assets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"isMaximized" : false,
"splitPaneDividerPosition" : 0.75
},
"addressBookFilePath" : "addressbook.json"
"addressBookFilePath" : "data\\assetbook.json"
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
"isMaximized" : false,
"splitPaneDividerPosition" : 0.75
},
"addressBookFilePath" : "addressbook.json"
"addressBookFilePath" : "data\\assetbook.json"
}
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public void readUserPrefs_extraValuesInFile_extraValuesIgnored() throws DataLoad
private UserPrefs getTypicalUserPrefs() {
UserPrefs userPrefs = new UserPrefs();
userPrefs.setGuiSettings(new GuiSettings(1000, 500, 300, 100, false, 0.75));
userPrefs.setAddressBookFilePath(Paths.get("addressbook.json"));
userPrefs.setAddressBookFilePath(Paths.get("data\\assetbook.json"));
return userPrefs;
}

Expand Down

0 comments on commit efe0fad

Please sign in to comment.