diff --git a/README.md b/README.md index df0a35f..281be31 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Then open **Hype** from the app launcher, or run `hype` in a terminal. ## Make a presentation -Open Hype from your app launcher. It reopens your last presentation; use **Ctrl+N** to start a new one, or **Ctrl+O** to choose a Markdown file. +Open Hype from your app launcher. It reopens your last presentation; use **Ctrl+N** to start a new one in your current Omarchy theme, or **Ctrl+O** to choose a Markdown file. In **Visual** mode, select a slide in the sidebar and write its Markdown below the preview. Changes appear as you type. Drag the divider to give the preview or editor more room. Two buttons in the top bar switch modes. The grid button, or **Ctrl+M**, turns the **Overview** on and off, returning to the mode you came from. The button beside it shows a slide in **Visual** mode and `#` in **Markdown** mode; click it, or press **Ctrl+.**, to switch between them. Markdown mode edits the whole presentation, with the same formatting bar on top. diff --git a/src/cli.cpp b/src/cli.cpp index e9f3a46..67b2b91 100644 --- a/src/cli.cpp +++ b/src/cli.cpp @@ -309,7 +309,7 @@ int exportDeck(const QStringList &arguments) { int create(const QStringList &arguments) { Command command("new", "Start a presentation, with images/ and videos/ beside it."); command.parser.addOption({"title", "Presentation title (default: the file name)", "title"}); - command.parser.addOption({"theme", "Installed theme; see hype themes (default: tokyo-night)", "name"}); + command.parser.addOption({"theme", "Installed theme; see hype themes (default: the current Omarchy theme)", "name"}); command.parser.addOption({"font", "Installed font family (default: JetBrains Mono)", "family"}); command.json(); command.parser.process(arguments); diff --git a/src/deck.cpp b/src/deck.cpp index 8273ac4..4702a6e 100644 --- a/src/deck.cpp +++ b/src/deck.cpp @@ -161,11 +161,27 @@ static QString slidesError(const ParsedDeck &parsed) { return {}; } // A new presentation, whose headline the window selects so typing replaces it. -static QString starterSource() { return "---\ntheme: tokyo-night\n---\n\n# " + tr("Your next idea") + "\n"; } +// Writes the theme's colors into the header too, so the deck looks the same where the theme isn't installed. +static QString themedHeader(QString header, const QString &name, const QString &colorsPath) { + header = setScalar(header, "theme", name); + header.remove(QRegularExpression("^color_[a-z_]+:[^\\n]*\\n", QRegularExpression::MultilineOption)); + for (const auto &[key, value] : readThemeColors(colorsPath)) + header = setScalar(header, "color_" + key, value); + return header; +} +// A new presentation starts in the desktop's current Omarchy theme. +static QString starterSource(const QMap &themes) { + QFile current(qEnvironmentVariable("XDG_STATE_HOME", QDir::homePath() + "/.local/state") + + "/omarchy/current/theme.name"); + QString name = current.open(QIODevice::ReadOnly) ? QString::fromUtf8(current.readAll()).trimmed() : QString(); + if (!themes.contains(name)) + name = "tokyo-night"; + return themedHeader(QString(), name, themes.value(name)) + "\n# " + tr("Your next idea") + "\n"; +} Deck::Deck(QObject *parent, const QString &exportProgram) : QAbstractListModel(parent), m_exportProgram(exportProgram.isEmpty() ? QCoreApplication::applicationFilePath() : exportProgram) { discoverThemes(); - m_source = starterSource(); + m_source = starterSource(m_themes); m_parsed = parseDeck(m_source); m_saved = m_source; // Writers may truncate, or remove and recreate, the file; read it once they settle. @@ -511,6 +527,7 @@ void Deck::redo() { apply(state.source, state.selected, false, state.anchor, &state.parsed); } void Deck::discoverThemes() { + m_themes.clear(); QString root = qEnvironmentVariable("OMARCHY_PATH", QDir::homePath() + "/.local/share/omarchy"); QStringList roots{root + "/themes", QDir::homePath() + "/omarchy/themes", QDir::homePath() + "/.config/omarchy/themes"}; @@ -591,13 +608,7 @@ QColor Deck::background() const { return QColor(palette()["background"].toString QColor Deck::foreground() const { return QColor(palette()["foreground"].toString()); } QColor Deck::accent() const { return QColor(palette()["accent"].toString()); } void Deck::chooseTheme(const QString &name) { - QString header = setScalar(m_parsed.header, "theme", name); - // Remove old palette before reading the newly selected installed theme. - header.remove( - QRegularExpression("^color_[a-z_]+:[^\\n]*\\n", QRegularExpression::MultilineOption)); - for (const auto &[key, value] : readThemeColors(m_themes.value(name))) - header = setScalar(header, "color_" + key, value); - replaceHeader(header); + replaceHeader(themedHeader(m_parsed.header, name, m_themes.value(name))); } QStringList Deck::mediaPositions() const { return ::mediaPositions(); } QVariantMap Deck::media() const { @@ -959,10 +970,13 @@ bool Deck::saveCopyPath(const QString &path) { void Deck::newDeck() { if (!confirmDiscard()) return; + // The current theme may have been installed since Hype opened. + discoverThemes(); + emit themesChanged(); m_path.clear(); m_saved.clear(); m_externalChange = false; - apply(starterSource(), 0); + apply(starterSource(m_themes), 0); m_undo.clear(); m_redo.clear(); watch(); diff --git a/src/deck.h b/src/deck.h index 3063b26..9510026 100644 --- a/src/deck.h +++ b/src/deck.h @@ -48,7 +48,7 @@ class Deck : public QAbstractListModel { Q_PROPERTY(bool exportFailed READ exportFailed NOTIFY exportChanged) Q_PROPERTY(QStringList fontNames READ fontNames CONSTANT) Q_PROPERTY(QString fontName READ fontName NOTIFY fontChanged) - Q_PROPERTY(QStringList themeNames READ themeNames CONSTANT) + Q_PROPERTY(QStringList themeNames READ themeNames NOTIFY themesChanged) Q_PROPERTY(QStringList mediaPositions READ mediaPositions CONSTANT) Q_PROPERTY(QString themeName READ themeName NOTIFY changed) Q_PROPERTY(QColor background READ background NOTIFY changed) @@ -148,6 +148,7 @@ class Deck : public QAbstractListModel { Q_INVOKABLE void setMediaSize(double percent); Q_INVOKABLE void setStatus(const QString &status); signals: + void themesChanged(); void changed(); // Document content, path, saved state, or media files; always followed by selectionChanged. void selectionChanged(); // Selection range or the selected slide's content/media. void fontChanged(); diff --git a/tests/tests.cpp b/tests/tests.cpp index 5a387c3..ca7f6a2 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -351,6 +351,8 @@ static void write(const QString &path, const QString &content) { void initTestCase() { QVERIFY(settingsDirectory.isValid()); QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, settingsDirectory.path()); + // New decks take the desktop's theme, so keep this machine's theme out of the tests. + qputenv("XDG_STATE_HOME", settingsDirectory.path().toUtf8()); } void portalFileDialogs() { if (!qEnvironmentVariableIsSet("HYPE_PORTAL_TESTS")) @@ -475,6 +477,28 @@ static void write(const QString &path, const QString &content) { QVERIFY(chosen.source().contains("color_background: \"#101020\"")); QVERIFY(chosen.source().contains("color_foreground: \"#eeeeee\"")); QCOMPARE(chosen.accent(), QColor("#7788ff")); + // A new presentation starts in the desktop's current theme. + const QByteArray previousState = qgetenv("XDG_STATE_HOME"); + const auto restoreState = qScopeGuard([&] { + if (previousState.isNull()) qunsetenv("XDG_STATE_HOME"); + else qputenv("XDG_STATE_HOME", previousState); + }); + qputenv("XDG_STATE_HOME", omarchy.path().toUtf8()); + QVERIFY(QDir().mkpath(omarchy.filePath("omarchy/current"))); + write(omarchy.filePath("omarchy/current/theme.name"), "hype-formats\n"); + Deck fresh; + QCOMPARE(fresh.themeName(), QString("hype-formats")); + QVERIFY(fresh.source().contains("color_background: \"#101020\"")); + // A theme installed while Hype is open is found for the next new deck. + QVERIFY(QDir().mkpath(omarchy.filePath("themes/hype-later"))); + write(omarchy.filePath("themes/hype-later/colors.toml"), "background = #203040\n"); + write(omarchy.filePath("omarchy/current/theme.name"), "hype-later\n"); + QSignalSpy themes(&fresh, &Deck::themesChanged); + fresh.newDeck(); + QCOMPARE(themes.count(), 1); + QVERIFY(fresh.themeNames().contains("hype-later")); + QCOMPARE(fresh.themeName(), QString("hype-later")); + QCOMPARE(fresh.background(), QColor("#203040")); } void followsDesktopTheme() { QTemporaryDir files;