Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
xfce4-panel-profiles
xfce4-panel-profiles
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 20
    • Issues 20
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Custom Issue Tracker
    • Custom Issue Tracker
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Apps
  • xfce4-panel-profilesxfce4-panel-profiles
  • Merge Requests
  • !4

Merged
Opened Jun 19, 2020 by Elliot@CheeseEBoiContributor

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://gitlab.xfce.org/CheeseEBoi/xfce4-panel-profiles.git" "master"
git checkout -b "CheeseEBoi/xfce4-panel-profiles-master" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "CheeseEBoi/xfce4-panel-profiles-master"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Add support for saving Whiskermenu configuration file

  • Overview 4
  • Commits 4
  • Pipelines 5
  • Changes 1

The settings for xfce4-whiskermenu-plugin will now be saved during the panel backup process and be properly restored. If there is no configuration file on the user's machine (.config/xfce4/panel/whiskermenu-1.rc), it will not be saved in the backup. If there is no configuration file in the backup (whiskermenu-1.rc), it will not throw an error and will just be ignored.

I haven't tested every possible configuration with these changes but everything I've tried works. Hope this can be incorporated soon!

Edited Aug 23, 2020 by Sean Davis
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: apps/xfce4-panel-profiles!4
Source branch: master

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.