forked from GafferHQ/gaffer
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Layouts/LayoutMenu : Improve management of custom layouts
- LayoutMenu : - New "Default/..." submenu allows the default layout to be chosen - New "Save As/*" options allow previously saved layouts to be replaced - Layouts : - Added `persistent` argument to `add()` method, mirroring the `Bookmarks.add()` API. This automatically takes care of saving persistent layouts into the startup location. - Added `setDefault()/getDefault()` and `createDefault()` methods to allow the management of a default layout. Breaking Changes : - Layouts : - Removed `save()` method. Use the `persistent` argument to `add()` and `setDefault()` instead. - Added applicationRoot argument to constructor. You should use `acquire()` instead anyway. - LayoutMenu : - Removed `delete()` method. - GUI config : Renamed standard layout from "Default" to "Standard". Fixes GafferHQ#51
- Loading branch information
1 parent
0c782fe
commit 6b9e880
Showing
6 changed files
with
196 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
########################################################################## | ||
# | ||
# Copyright (c) 2018, Image Engine Design Inc. All rights reserved. | ||
# | ||
# Redistribution and use in source and binary forms, with or without | ||
# modification, are permitted provided that the following conditions are | ||
# met: | ||
# | ||
# * Redistributions of source code must retain the above | ||
# copyright notice, this list of conditions and the following | ||
# disclaimer. | ||
# | ||
# * Redistributions in binary form must reproduce the above | ||
# copyright notice, this list of conditions and the following | ||
# disclaimer in the documentation and/or other materials provided with | ||
# the distribution. | ||
# | ||
# * Neither the name of John Haddon nor the names of | ||
# any other contributors to this software may be used to endorse or | ||
# promote products derived from this software without specific prior | ||
# written permission. | ||
# | ||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS | ||
# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | ||
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
# | ||
########################################################################## | ||
|
||
import Gaffer | ||
import GafferUI | ||
import GafferUITest | ||
|
||
class LayoutsTest( GafferUITest.TestCase ) : | ||
|
||
def testAcquire( self ) : | ||
|
||
a = Gaffer.ApplicationRoot( "testApp" ) | ||
self.assertIsInstance( GafferUI.Layouts.acquire( a ), GafferUI.Layouts ) | ||
self.assertIs( GafferUI.Layouts.acquire( a ), GafferUI.Layouts.acquire( a ) ) | ||
|
||
def testAddAndRemove( self ) : | ||
|
||
a = Gaffer.ApplicationRoot( "testApp" ) | ||
l = GafferUI.Layouts.acquire( a ) | ||
self.assertEqual( l.names(), [] ) | ||
|
||
l.add( "JustTheGraphEditor", "GafferUI.GraphEditor( script )" ) | ||
self.assertEqual( l.names(), [ "JustTheGraphEditor" ] ) | ||
|
||
l.add( "JustTheNodeEditor", "GafferUI.NodeEditor( script )" ) | ||
self.assertEqual( l.names(), [ "JustTheGraphEditor", "JustTheNodeEditor" ] ) | ||
|
||
l.remove( "JustTheGraphEditor" ) | ||
self.assertEqual( l.names(), [ "JustTheNodeEditor" ] ) | ||
|
||
l.remove( "JustTheNodeEditor" ) | ||
self.assertEqual( l.names(), [] ) | ||
|
||
def testPersistence( self ) : | ||
|
||
a = Gaffer.ApplicationRoot( "testApp" ) | ||
l = GafferUI.Layouts.acquire( a ) | ||
self.assertEqual( l.names(), [] ) | ||
|
||
l.add( "JustTheGraphEditor", "GafferUI.GraphEditor( script )" ) | ||
self.assertEqual( l.names(), [ "JustTheGraphEditor" ] ) | ||
self.assertEqual( l.names( persistent = False ), [ "JustTheGraphEditor" ] ) | ||
self.assertEqual( l.names( persistent = True ), [] ) | ||
|
||
l.add( "JustTheNodeEditor", "GafferUI.NodeEditor( script )", persistent = True ) | ||
self.assertEqual( l.names(), [ "JustTheGraphEditor", "JustTheNodeEditor" ] ) | ||
self.assertEqual( l.names( persistent = False ), [ "JustTheGraphEditor" ] ) | ||
self.assertEqual( l.names( persistent = True ), [ "JustTheNodeEditor" ] ) | ||
|
||
if __name__ == "__main__": | ||
unittest.main() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.